TO - branch (for example master) FROM - branch (for example bob) To do merge just checkout TO: $ git checkout TO Do merge: $ git merge FROM Beware of conflicts! :) Fear the merge!