git提交后,有新的代码提交导致的冲突This change has merge conflicts. Download the patch and run “git rebase master“.

This change has merge conflicts. Download the patch and run "git rebase master".
Upload a new patchset after resolving all merge conflicts.

This change has merge conflicts. Download the patch and run "git rebase master".
Upload a new patchset after resolving all merge conflicts.

这个问题是因为提交代码后没有及时入库,有新的代码提交导致冲突,解决方法:

1. 查看当前分支修改 git status
2. 保存当前修改到缓存区 git  stash save
3. 创建新的分支并进入 git checkout -b "location_name"  remote/m/远程分支
4. 拉去代码 git pull
5. cherrypick (git fetch)
6. git status .
7. git diff 查看冲突 解决冲突
8. 解决冲突后 git add
9. git cherry-pick --continue
10. git push origin HERD:refs/for/远程分支
11. 完成后 切换到编码的本地分支 git checkout 本地编码分支
12. git stash apply