I want to change a specific commit but do not want to deal with all the conflicts manually and simply apply all the HEAD diff versions for all conflicts.
I change the commit with
git rebase -i <hash-1>
Do my modification and ammend the commit. Now I want to do the same thing as if I was doing
git rebase -X ours
But I can't, it says I should abort the current rebase.
