You think you know Git, until you have a merge conflict on Friday at 5pm. Rebase vs Merge, Atomic Commits, and how to undo mistakes.
