I often rebase my local commits on a remote branch to keep my branch up to date with changes in the remote branch.
I find this simpler and cleaner than introducing a series of merge commits in my local branch.
I find this simpler and cleaner than introducing a series of merge commits in my local branch.
When we go back and view those changes, they are all in terms of this codebase, not the original changes that do not apply cleanly to this codebase. That's a big problem with git merges: the merge itself is one huge jump that collapses all the changes. The original changes are traceable in its lineage through the second parent, but those are the verbatim original changes, not the merged changes.