This is my scenario:
- My branch is rebased against some other branch
- that other branch changed and I want to get mine back to sync
- I do a rebase and magit makes me go through all commits and merge
In terminal I would do this with a git rebase -X ours root-branch
. Is something like that possible with magit? If that's not possible, is there some alternative for what I'm trying to achieve?