Git Legit

Pauline Vos (06.Oct.2018 at 14:15, 50 min)
Talk at ScotlandPHP 2018 (English - UK)

Rating: 5 of 5

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!

Who are you?

Claim talk

Talk claims have been moved to the new Joind.in 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 minus zero

Comments

Rating: 4 of 5

06.Oct.2018 at 14:58 by Rob Wilson (27 comments) via Web2 LIVE

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

Rating: 5 of 5

06.Oct.2018 at 15:59 by Joop Lammerts (6 comments) via Web2 LIVE

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

Rating: 5 of 5

06.Oct.2018 at 16:10 by Daniel Craigie (20 comments) via Web2 LIVE

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

Rating: 4 of 5

06.Oct.2018 at 16:46 by Severin Bruhat (7 comments) via Web2 LIVE

Good reminders, thanks for the cheatsheet

Rating: 4 of 5

06.Oct.2018 at 16:57 by Ken Guest (35 comments) via joind.in Android app

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

Rating: 5 of 5

06.Oct.2018 at 19:49 by Eleonora Ivanova (3 comments) via Web2 LIVE

Great talk!

Rating: 5 of 5

06.Oct.2018 at 21:18 by Duncan Davidson (3 comments) via Web2 LIVE

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.

Rating: 5 of 5

07.Oct.2018 at 12:05 by Andy Gaskell (24 comments) via Web2 LIVE

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

Rating: 5 of 5

07.Oct.2018 at 17:27 by Jordan Beattie (4 comments) via Web2 LIVE

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.

Rating: 5 of 5

08.Oct.2018 at 10:05 by Jack McCourt (3 comments) via Web2 LIVE

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

Rating: 5 of 5

08.Oct.2018 at 10:34 by Richard Black (17 comments) via Web2 LIVE

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.

Rating: 5 of 5

08.Oct.2018 at 10:53 by Patryk Zajdler (7 comments) via Web2 LIVE

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.

© Joind.in 2018