git checkout commit and merge master 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 two branches git

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