git how to merge braches code example
Example: 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
//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