NOTES: Merge or Rebase
Tips to remember how to merge and/or rebase
Tags: merge, rebase, cheatsheet, git