git merge master 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 master into feature branch

git checkout feature1
git merge master