Skip to content

Instantly share code, notes, and snippets.

@nivir
Forked from ldodds/git-blame-club.txt
Created September 18, 2016 20:24
Show Gist options
  • Select an option

  • Save nivir/608404e3c5345b3fcaec01afce51186c to your computer and use it in GitHub Desktop.

Select an option

Save nivir/608404e3c5345b3fcaec01afce51186c to your computer and use it in GitHub Desktop.
Git Blame Club
Welcome to Git Blame Club.
The first rule of Git Blame Club is: you do not blame other people.
The second rule of Git Blame Club is: you DO NOT blame other people!
Third rule of Fight Club: if someone yells "CONFLICT!", goes limp, or taps out, the blaming is over.
Fourth rule: only two branches to a merge.
Fifth rule: one merge at a time, everyone.
Sixth rule: the merges are command-line. No editors, no GUIs.
Seventh rule: merges will go on as long as they have to.
And the eighth and final rule: if this is your first day at Git Blame Club, you have to commit.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment