merge one branch into another code example

Example 1: git merge branch to master

$ git checkout master
Switched to branch 'master'
$ git merge iss53
Merge made by the 'recursive' strategy.
index.html |    1 +
1 file changed, 1 insertion(+)

Example 2: git merge branch to another branch

git checkout targetBranch
git merge sourceBranch

Example 3: 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 4: how to merge a branch into another branch

git checkout YourBranch
git merge develop

Example 5: merge another branch into current

git checkout branch_name // checkout to branch you want to merge to if not in it already
git merge branch_to_merge_from

Tags:

Misc Example