git-rebase
man page mentions -X<option>
can be passed to git-merge
. When/how exactly?
I'd like to rebase by applying patches with recursive strategy and theirs option (apply whatever sticks, rather than skipping entire conflicting commits). I don't want merge, I want to make history linear.
I've tried:
git rebase -Xtheirs
and
git rebase -s 'recursive -Xtheirs'
but git rejects -X
in both cases.
git rebase -Xtheirs
works in recent versions, except tree conflicts need to be resolved manually. You need to run git rebase -Xtheirs --continue
(with -X
repeated) after resolving those conflicts.
Question&Answers:
os 与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…