merge branch into another code example

Example 1: how to merge git branch to master

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

Example 2: git merge branch

//this is for merging into a local branch//

// checkout the branch to merge INTO
git checkout master
// merge local feature branch into master branch
git merge feature_branch_name

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: git merge branch to another branch

git checkout targetBranch
git merge sourceBranch

Example 5: how to merge a branch into another branch

git checkout YourBranch
git merge develop

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