4 ms·
> The problems happened because rebasing changes the identity of commits. When merging that result, commits that have previously been merged create conflicts as
by account42 2y ago
> The problems happened because rebasing changes the identity of commits. When merging that result, commits that have previously been merged create conflicts as they now need to be re-merged under the alias of a different commit hash.
And this literally cannot happen in the standard rebase workflow where you have one development branch and then rebase your feature branches on top of that development branch before (fast-forward) merging.