使用git中rebase遇到的坑二 could not apply xxxx

当我们使用git rebase 的时候经常会出现以下命令  

git rebase -i resumeerror: could not apply 6b442cc... accout infoWhen 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".Could not apply 6b442cc81d1feba15b2f851753483a82b1044438... accout info

我们可以使用git status 查看出现此问题的原因

both modified:   src/resume/js/account/index/account.js

both added:      src/resume/js/account/index/account.vm

both modified:   src/resume/js/account/modules/account.js

both modified:   src/resume/js/account/modules/info.js

上面告诉我们  同时修改了这几个文件 出现了冲突   

接下来就的步骤是

1.解决冲突

2.git add   git commit

3. git rebase --continue