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.
这个问题是因为提交代码后没有及时入库,有新的代码提交导致冲突,解决方法:
- 查看当前分支修改 git status
- 保存当前修改到缓存区 git stash save
- 创建新的分支并进入 git checkout -b "location_name" remote/m/远程分支
- 拉去代码 git pull
- cherrypick (git fetch)
- git status .
- git diff 查看冲突 解决冲突
- 解决冲突后 git add
- git cherry-pick --continue
- git push origin HERD:refs/for/远程分支
- 完成后 切换到编码的本地分支 git checkout 本地编码分支
- git stash apply