Git

Guide for using git version control.

General rules

Do not include any files or folders that are only specific to your development environment. E.g:
- IDE generated folders (.idea, ...)
- Files logged from run time (console.log,...)
- ...
Delete local feature branches, and delete/merge remote feature branches after merging.
Rebase to get changes from main branch frequently while working on feature branches.
Should follow Conventional Commits to have good commit messages.
For large projects that requires complex release process, consider applying Git flow
Name your branches properly so that everyone can understand: feature/sign-up , fix/login-issue,...

Create local branch from main branch (master or develop).

git checkout master
git pull origin master
git checkout -b <branch-name>

Frequently pull new code from main branch while working on feature branches.

git pull origin master --rebase

Or

git fetch origin
git rebase origin/master

Push your branch to remote.

git push origin <branch-name>

Create pull request on your Git version control tool (Github, Bitbucket, GitLab, ...)

Squash your multiple commits by Rebasing interactively before creating pull request (this is optional step).

git fetch origin
git rebase origin/master -i

Force push feature branch to remote.

git push origin <branch-name> -f

Merge PR using Git web tool.

If you want to merge it manually, you should merge using --no-ff option to reserve merge commit message on git commit tree.

git fetch origin
git checkout master
git pull origin master
git merge <branch-name> --no-ff
git push origin master

Delete local feature branch after merging.

git branch -D <branch-name>

Delete remote branch (optional, as some Git tool has option to auto-close merged branches).

git push origin --delete <branch-name>