git branch merge code example

Example 1: git command to create a branch

//Create a New Branch
git checkout -b [name_of_your_new_branch]
//First Push
git push --set-upstream origin [name_of_your_new_branch]

Example 2: 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 3: create new branch git from master

git checkout -b new-branch-name

Example 4: how to merge git branch to master

git checkout master
git pull origin master
git merge test
git push origin master

Example 5: 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

Example 6: git merge

git checkout master			# master is checked out
git pull					# update local
git merge new-feature		# merge branch new-feature into master
git push					# changes on remote. Then checkout a feature branch