A本地修改了某个文件File，B本地也修改了这个文件File，他们都先后git push到了gerrit上，这个时候reviewer无论先进谁的提交，gerrit上另一笔提交的状态都会显示merge conflict，那如何更新这一笔change，而不是Abandon然后再提一个change呢，假设A的提交了先进了，要修改B的change。
先同步服务器代码
git remote updat
rebase
git rebase remote_branch
会出现如下提示：
First, rewinding head to replay your work on top of it...
Applying: your_patch
Using index info to reconstruct a base tree...
M your_modified_file
Falling back to patching base and 3-way merge...
Auto-merging your_modified_file
CONFLICT (content): Merge conflict in your_modified_file
Recorded preimage for 'your_modified_file'
Failed to merge in the changes.
Patch failed at 0001 your_patch
The copy of the patch that failed is found in:
/your_prj_path/.git/rebase-apply/patch
When 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 log就能看到A的提交。
git status能看到此时正在rebasing,要你修复冲突后再运行continue rebase:
rebase in progress; onto 5ac5126
You are currently rebasing.
(fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch)
(use "git rebase --abort" to check out the original branch)
Unmerged paths:
(use "git reset HEAD <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: your_conflict_file
no changes added to commit (use "git add" and/or "git commit -a")
修改冲突文件
打开冲突文件，能发现A和B的提交都在里面，手动编辑这个文件让他保持A的提交内容，然后再加上B的修改。
mark resolution
git add .
add后会提示冲突修复了。
rebase in progress; onto 5ac5126
You are currently rebasing.
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: your_file
继续rebase
git rebase --continue
成功后会提示：
Applying: your_patch
Recorded resolution for 'your_modified_file'.
再git log方法B的提交在A的后面。
提交
push后gerrit这一笔提交status的merge conflict已经没有了，History里会显示：
Uploaded patch set 2.
OK, Done.
网友评论