1220
A classic
(sopuli.xyz)
Post funny things about programming here! (Or just rant about your favourite programming language.)
I always squash my commits before rebasing. Is your way easier? I never really seem to have a problem with merge conflicts.
We squash when merging. Final git history is super clean and linear.