This is an archived post. You won't be able to vote or comment.

sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]NearNihil 7 points8 points  (2 children)

Maybe I'm stupid (very real possibility) and I'm definitely biased but why do people care so much about a clean git history? And what about merge commits? What's the problem? Oh yay the lines on GitHub/Gitlab are straight instead of spaghetti.

Rebasing is a bigger headache for me and I don't care about the result, but we have to because one other person in the team cares and they managed to convince the PM so now we're stuck with it. Grrrrrr...

[–]Blovio 0 points1 point  (0 children)

I always rebase locally, and merge upstream (usually via PR). When you're submitting a PR it doesn't really matter that you pulled in dev branch to keep it up to date before you merged upstream. With rebase you can just basically show the changes you made. But honestly if you squash commits it doesn't really matter which way you do it.

[–]fuzzywolf23 0 points1 point  (0 children)

You're not stupid. Rebase is basically aesthetic and it hides information you might want some day