If I run:
git rebase --strategy-option=theirs master
I expect it to rebase my branch onto master, and resolve any conflicts using my branch.
However I get:
Auto-merging versions.bzl
error: could not apply 43b0d2f4e47... Did something
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 43b0d2f4e47... Did something
Why is the rebase aborting with conflicts, even though I’ve specified the --strategy-option
?