Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled

来源：https://stackoverflow.com/questions/25887799/using-source-tree-rebase-with-conflict-rebase-doesnt-work-after-conflict-reso