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,

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.