压缩线性提交历史时发生冲突

Question

怎么可能在尝试压缩/修复线性分支时仍然需要手动合并？repo已从Subversion转换而来.每个冲突都是"自动挑选失败"或"由于空提交消息而中止提交".后者我能理解,但是一个--fixup-empty或者什么东西会有用.

典型输出:

user@machine:/path (master|REBASE-i)$ git add * && git rebase --continue 
[detached HEAD c536940] fixup!
 Author: John Doe <John.doe@example.com>
 2 files changed, 57 insertions(+), 4 deletions(-)
Automatic cherry-pick failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>', and
run 'git rebase --continue'
Could not apply 8854a54... >6d5f180 foo
user@machine:/path (master|REBASE-i)$ git st
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#   both modified:      filename.ics
#
no changes added to commit (use "git add" and/or "git commit -a")

Answer 1

这些工作：

git mergetool
git rebase --continue