//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
$ git checkout master $ git branch new-branch $ git checkout new-branch # ...develop some code... $ git add –A $ git commit –m "Some commit message" $ git checkout master $ git merge new-branch
// checkout the branch to merge INTO git checkout master // merge local feature branch into master branch git merge feature_branch_name
git checkout YourBranch git merge develop
git checkout targetBranch git merge sourceBranch