Andreas Hennings <andreas@xxxxxxxxxxx> writes: > This means we need a rebase operation where: > - The commits of the acceptance branch itself are being replaced. > - The commits of the feature branches remain as they are. > > A "git rebase --preserve-merges" almost does this, but not really. This wished-for feature sounds to me more like the "first-parent" mode that has been discussed a few times in the past but never materialized. The preserve-merges mode is getting abandoned by the original author as unsalvageable. Have you tried the rebase-merges mode? That may let you choose replaying only the merge commits on the acceptance branch without touching the tips of the feature branches getting merged.
