Advanced Git Techniques to Manage
Open Source Contributions

Brian Dukes

We Want Your Feedback!

Download the DNN Summit  Mobile App now and take the survey at the end of the conference to be entered to win a $100 Amazon gift card!

Resources

https://git-scm.com/book

https://lab.github.com/

Fundamentals

Branches, Tags, Remotes

Pull Requests

Fast-Forward

Accepting Contributions

Merge vs. Rebase vs. Squash

Two Branches

Fast-Forward Merge/Rebase

Merge Commit

Rebase

Squash

Reworking Contributions

Small Commits

Amend Commit

Reword

Interactive Rebase

Fix Conflicting Commit

  • Remove
  • Fixup
  • Reword
  • Squash

Consider Draft Pull Requests

Reducing & Resolving Conflicts

Tools

gmaster logo
SemanticMerge logo

Merge Conflict

vs.

Rebase Conflicts

Small Commits, Small Pull Requests