Skip to content

Instantly share code, notes, and snippets.

View nathanhinchey's full-sized avatar

Nathan Hinchey nathanhinchey

  • Brooklyn, NY, USA
View GitHub Profile
@nathanhinchey
nathanhinchey / 0main.md
Last active December 8, 2015 19:19 — forked from canton7/0main.md
Git Bisect and Feature Branches

Git Bisect and Feature Branches

There are people out there who claim that merge-based workflows (that is, workflows which contain non-fast-forward merges) are bad. They claim that git bisect gets confused by merge-based workflows, and instead advocate rebase-based workflows without explicit feature branches.

They're wrong.

Furthermore, the "advantages" of their workflows are in fact disadvantages. Let me show you.