Re:Git: Using Advanced Rebase Features for a Clean Repository
by branja on Wednesday August 09, 2017 @08:05AM
(#14967717)
You can do both. Squash your working branch to a single commit, then rebase. That way you still get a clean view of just the changes introduced in the branch, and don't have to resolve merge conflicts every step of the rebase.
But, again, this depends on the situation, the code, the history, the patches, etc. It's just a useful tool to keep in mind come merge time.