Git Legit

Pauline Vos (03.Nov.2018 at 15:40, 50 min)
Talk at Madison PHP Conference 2018 (English - US)

Rating: 5 of 5

If you're fighting with Git on a regular basis, you might not be using it optimally. Many Git users tend to use Git as a save point, like in a video game; chronologically making checkpoint commits as they go. This spreads out changes to the same areas in the code over several commits, necessitates merging and resolving conflicts, and generally just makes an incomprehensible jumble of your history. This talk makes a case for atomic commits and how to use them while only minimally affecting your workflow. Using pre-recorded demos, you'll learn how to properly interactively rebase, fix up, reset, bisect, and more. By the end of the talk, you'll have seen how this Git flow will make your life easier and how it will affect your ability to cherry pick, drop unwanted commits, and most importantly: not spend hours resolving conflicts in rebase hell. A little change in habits can go a very long way!

Who are you?

Claim talk

Talk claims have been moved to the new site.

Please login to the new site to claim your talk

Want to comment on this talk? Log in or create a new account or comment anonymously

Write a comment

Please note: you are not logged in and will be posting anonymously!
= four plus nine


Rating: 5 of 5

03.Nov.2018 at 21:02 by Nate Finch (3 comments) via Web2 LIVE

Really great examples and application. Also super helpful resources to follow up on.

Rating: 5 of 5

04.Nov.2018 at 06:45 by Corey Halpin (6 comments) via Web2 LIVE

The talk made a compelling case for atomic commits, with good examples to illustrate the concept.

Rating: 5 of 5

04.Nov.2018 at 12:51 by Juan P Martinez Rios (16 comments) via Web2 LIVE

Great examples during the talk

Rating: 5 of 5

05.Nov.2018 at 16:46 by Bob Lindner (14 comments) via Web2 LIVE

Good examples. Enjoyed hearing how others are doing this.

© 2018