1214
A classic (sopuli.xyz)
you are viewing a single comment's thread
view the rest of the comments
[-] dandroid@dandroid.app 7 points 3 years ago

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

[-] charliespider@lemmy.world 4 points 3 years ago

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

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

Programmer Humor

43869 readers
262 users here now

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

Rules:

founded 7 years ago
MODERATORS