[Gerrit][Git] path conflict的方法

Error Message:

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

紀錄，等待實驗..
http://cmc925.blogspot.tw/2011/12/your-change-could-not-be-merged-due-to.html
http://blog.csdn.net/wtysksk/article/details/8123639

--

130222 update
實驗過

1. 已經push change到gerrit
2. 在local端下git pull --rebase
3. 重新push到原有的change
$ git push ssh://[account]/[gerrit_project_path] HEAD:refs/change/[changeID]
4. 在gerrit中原有的change會顯示上了第二個patch