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.

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

    View Slide

  2. [email protected]
    education.github.com
    @matthewmccull
    Q&A

    View Slide

  3. Branch everything

    View Slide

  4. Reuse commit messages

    View Slide

  5. Combine with amend

    View Slide

  6. Redo with reset

    View Slide

  7. Squash a merge

    View Slide

  8. Reuse with cherry pick

    View Slide

  9. Rebase on a branch

    View Slide

  10. Rebase interactively

    View Slide

  11. Fixup with rebase

    View Slide

  12. Branch duplication

    View Slide

  13. Reflog for resurrection

    View Slide