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 making 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.

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!

Comments

Comments are closed.

Rated 4

Rob Wilson at 14:58 on 6 Oct 2018

Great talk by Pauline. A couple of useful updates for Git that I didn’t know. Presentation was great, and demos worked well. The display of the QR code was useful, but would have been great to add the url on screen as well (but that’s me nitpicking). Looking forward to more talks

Rated 5

Joop Lammerts at 15:59 on 6 Oct 2018

A great talk which a lot of developers should see :) keep it up!

Rated 5

Daniel Craigie at 16:10 on 6 Oct 2018

Good talk. I always enjoy coming to a conference to find I've been doing it all wrong.....

Rated 4

Severin Bruhat at 16:46 on 6 Oct 2018

Good reminders, thanks for the cheatsheet

Rated 4

Ken Guest at 16:57 on 6 Oct 2018

Honestly my only complaint would be that I'd have liked to see URLs alongside the QR codes. Great talk otherwise. Thanks

Great talk!

This was a great talk. It was really useful even for someone who uses Git regularly.

The explanation of binary searching using eggs was a superb nugget.

Rated 5

Andy Gaskell at 12:05 on 7 Oct 2018

Excellent talk from Pauline, engaging and practical. Looking forward to trying out git bisect next week!

Rated 5

Jordan Beattie at 17:27 on 7 Oct 2018

Every developer should see this talk. Such great tips and pointers for using Git properly. I think so many developers and teams are under-utilising Git simply because they don't know any better.
We have plans to run through Pauline's slides with the team and to get everyone on board with following her advice.

Rated 5

Jack McCourt at 10:05 on 8 Oct 2018

I thought I knew git quite well, but this taught me things I didn't even think to do.

Rated 5

Richard Black at 10:34 on 8 Oct 2018

As someone who's not ventured much beyond the "checkpoint commit" way of using version control, this was a real eye-opener. And presented with such confidence it was hard to believe it was the speaker's first conference presentation.

Rated 5

Patryk Zajdler at 10:53 on 8 Oct 2018

Fantastic talk. I thought I knew git inside out and Pauline has proven me wrong. Most developers, even if they are comfortable with git, should see this talk.