merge in git code example

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

Example 2: git merge

$ git checkout master
		Switched to branch 'master'
$ git merge <your brach name>

Example 3: git merge tag to branch and squash commits

git checkout master
git merge --squash tag
git commit

Example 4: merge two branches git

# merge two branches
1] you should be on MainBranch -- git checkout MainBranch
2] then run merge command -- git merge SubBranch

Example 5: git merge

$ git checkout master
Switched to branch 'master'
$ git merge iss53