merge local branch code example

Example 1: 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 2: merge git branch

1. //pull the latest changes of current development branch if any        
git pull (current development branch)

2. //switch to master branch
git checkout master 

3. //pull all the changes if any
git pull

4. //Now merge development into master    
git merge development

5. //push the master branch
git push origin master

Example 3: git merge local branch

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

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