当使用git rebase碰到冲突时，

git rebase 
     
      /
      
     

信息如下：

error: Failed to merge in the changes.Patch failed at 0001 The copy of the patch that failed is found in: .git/rebase-apply/patchWhen you have resolved this problem, run "git rebase --continue".If you prefer to skip this patch, run "git rebase --skip" instead.To check out the original branch and stop rebasing, run "git rebase --abort".

在代码上解决冲突后，

git add .

将修改add进来，并且继续rebase提交，使用命令

git rebase --continue

最后push代码

git push