第71页

It works by going to the common ancestor of the two branches (the one you’re on and the
one you’re rebasing onto), getting the diff introduced by each commit of the branch you’re on,
saving those diffs to temporary files, resetting the current branch to the same commit as the
branch you are rebasing onto, and finally applying each change in turn
At this point, you can go back to the
 branch and do a fast-forward merge

如果temporary diff文件在apply时出现冲突怎么办？