this post was submitted on 26 Aug 2023
1213 points (98.4% liked)

Programmer Humor

32382 readers
724 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] [email protected] 33 points 1 year ago (1 children)

Rebase all of your work branches onto HEAD so that conflicts require refactoring the first commit where things don't match up. This can make conflicts easier to deal with (in my humble opinion) since you deal with conflicts earlier in your commit history as opposed to at the end after ALL of your changes are made.

Plus a linear history is super nice to work with later on.

[–] [email protected] 7 points 1 year ago (1 children)

I always squash my commits before rebasing. Is your way easier? I never really seem to have a problem with merge conflicts.

[–] [email protected] 4 points 1 year ago

We squash when merging. Final git history is super clean and linear.