Git daily merge process

Merge process

1. shelve local changes
2. checkout master local branch
3. command: git pull origin master
4. checkout local branch, e.g. TomBranch
5. Merge local master to local branch, command: git merge master
6. unshelve local changes (may need some manual merge at this stage)

git pull is an alias for git fetch && git merge you cannot fetch from local branches (only from remotes) - actually you don’t need to, if your intention is to merge master into local_branch, just use git merge master when you are on local_branch.

merge changes from local_branch TO master:
git checkout master
git merge local_branch

merge changes from master TO local_branch:
git checkout local_branch
git merge master

Create new local branch based on a specific remote branch

git checkout -b <new_local_branch_name> <remote_branch_name>
e.g.
git checkout -b my_local_branch origin/branch_A
When the new branch gets created, its up-stream has also been setup.
And now we can pull, push…