git rebase's --preserve-merges not strong enough

Question

I want to rebase, editing an older commit of mine, after which there have been merging involving conflicts. I know about git rebase --preserve-merges:

How to rebase a merge but keep the merge commit

but - it doesn't do its job good enough. Instead of just resolving conflicts in favor of "ours", it balks at cases of both my branch and the merged branch having made changes which conflict with each other. I need the merge to be resolved exactly as it had originally been (assuming, of course, the relevant text/code has not been affected by my rebase). Is it possible to do this?

https://stackoverflow.com/search?q=%5Bgit-rebase%5D+merge – phd Jul 01 '21 at 14:52 — phd, Jul 01 '21 at 14:52
@phd what does that have to do with my question? – einpoklum Jul 01 '21 at 16:25 — einpoklum, Jul 01 '21 at 16:25
It answers that you should do `git rebase --rebase-merges` – phd Jul 01 '21 at 17:57 — phd, Jul 01 '21 at 17:57

score 0 · Answer 1 · answered Jul 01 '21 at 13:50

The --rebase-merges mode is similar in spirit to the deprecated --preserve-merges but works with interactive rebases, where
commits can be reordered, inserted and dropped at will.

according to the man page, you should be using --rebase-merges (unless you are on an older git version)

but when you try it you'll see that there is a whole language you have to learn with this one, so that might lead to more questions

I still use --preserve-merges for the simple stuff I do, but --rebase-merges might be the stronger solution you are looking for

git rebase's --preserve-merges not strong enough

1 Answers1