On: Oh Shit, Git

[havblue]

For someone to get out of a mess they would have to know that they caused a mess in the first place! I'm starting to think trying to get people to use rebase and squash is a losing battle when they frequently just merge without pulling.

[cube00 → havblue]

I got my team on side to use rebase/squash instead of blind merge commits after I showed them how much easier git bisect is to use when you have a linear commit history in your main branch. Now nobody wants to be 'that person' who breaks the bisect feature in case we urgently need it.

[timerol → cube00]

"git bisect --first-parent" gives most of the same benefits for teams that don't rebase/squash.

At least until someone does a foxtrot merge and then it never works again

[codethief → timerol]

What's a foxtrot merge?

[cube00 → codethief]

I had to look it up as well. https://blog.developer.atlassian.com/stop-foxtrots-now/

[sethammons → havblue]

I loath rebasing. Squash merge into the main branch after tests are green. Bisect still works.