Creating a branch just before merge code example
Example 1: git new branch
$ git checkout -b [your_branch_name]
# Switched to a new branch [your_branch_name]
# This is shorthand for:
$ git branch [your_branch_name]
$ git checkout [your_branch_name]
Example 2: merging branches in git
//Make sure you are in your branch. Develop is a a branch in this case
git checkout master
Switched to branch 'master'
git pull
To pull changes of team members to your master
git checkout develop
git merge master
Resolve Conflicts in develop
git checkout master
git merge develop
To merge your final changes along with other changes to your master
git pull
If there were any additional changes made meanwhile
git push
To push the final master to the master repository
git checkout develop
//Move to branch again to work