bob.txt 184 B

12345678910111213
  1. TO - branch (for example master)
  2. FROM - branch (for example bob)
  3. To do merge just checkout TO:
  4. $ git checkout TO
  5. Do merge:
  6. $ git merge FROM
  7. Beware of conflicts! :)
  8. Fear the merge!