Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git Feature Branches as an Art

Git Feature Branches as an Art

Slides from Matthew's Fluent (http://fluentconf.com/fluent2014) talk on Feature Branches in Git.

Bededa744012c87721d68f69342f81b0?s=128

Matthew McCullough

March 12, 2014
Tweet

More Decks by Matthew McCullough

Other Decks in Programming

Transcript

  1. Feature Branches
 as an art with Matthew McCullough at Fluent

    2014
  2. education@github.com education.github.com @matthewmccull Q&A

  3. Branch everything

  4. Reuse commit messages

  5. Combine with amend

  6. Redo with reset

  7. Squash a merge

  8. Reuse with cherry pick

  9. Rebase on a branch

  10. Rebase interactively

  11. Fixup with rebase

  12. Branch duplication

  13. Reflog for resurrection