++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Ubuntu 12.04.1 LTS (GNU/Linux 3.2.0-29-generic x86_64)
Apache 2.2
Gerrit:2.8.4
Jenkins:Jenkins ver. 1.559
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Q1. Gerrit
"publish and submit" 后冲突“Your change could not be merged due to a path conflict.Please
merge (or rebase) the change locally and upload the resolution for review.“
"publish and submit" 后冲突“Your change could not be merged due to a path conflict.Please
merge (or rebase) the change locally and upload the resolution for review.“
A1.
这个是因为之前我把原来的项目删除后重新创建一个同名的项目,因为数据库里还存有原来的change-ID信息
Q2." remote:
ERROR: committer email address remote: ERROR: does not match your user account."
ERROR: committer email address remote: ERROR: does not match your user account."
remote: Processing changes: refs: 1, done remote: remote: ERROR: In commit 0059c6b3c1c60fcc3e7863fa62f7d19b0b69afcd remote: ERROR: committer email address joey.zhang@mail.com remote: ERROR: does not match your user account. remote: ERROR: remote: ERROR: The following addresses are currently registered: remote: ERROR: joe.chan@mail.com remote: ERROR: remote: ERROR: To register an email address, please visit: remote: ERROR: http://172.16.147.2:8082/#/settings/contact remote: remote: To ssh://gerritxmic/flagship.git ! [remote rejected] master -> master (invalid committer) error: failed to push some refs to 'ssh://gerrit/test.git'
A2.需要配置 'Forge Committer' 和 'Forge Author' 访问权限, 让 Gerrit 忽略你不是正在 push 的提交的 author 或者 committer。直接把Anonymous
Users组或者其他组给加上就行了。