create and merge branch git code example
Example 1: merge branch to branch
git checkout master
git merge new-branch
git push
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