4 ms·
Merge does that, yes, hence the preference for rebase flows. (I'm surprised this got a downvote when that's how we got here: a situation in which a change was
by pjc50 3y ago
Merge does that, yes, hence the preference for rebase flows.
(I'm surprised this got a downvote when that's how we got here: a situation in which a change was ""hidden"" in a merge commit that would have been explicit in a rebase workflow)