Nov 10, 2018

Git Basic Merge

To merge the changes from your branch into master:

If you are not currently at master, switch to your master first:


$ git checkout master
Switched to branch 'master'
$ git merge mybranch

To merge the changes from your master into your branch:

If you are not currently at your branch, switch to your branch first:


$ git checkout mybranch
Switched to branch 'mybranch'
$ git merge master