The change cannot be merged due to a path conflict. Rebase the change and upload the rebased commit for review

[Mohan Kumar]

Gerrit Version-2.14.7

Git Client Version-2.17

Problem:

One of our user successfully got reviewed his code with (Code Review +2), then when he tried to submit the review request, it shows below message on gerrit GUI.

The change cannot be merged due to a path conflict. Rebase the change and upload the rebased commit for review.

Can someone guide me to resolve the same.

[Matthias Sohn]

did you try what the error message told you to do ? This error is raised if another change

was merged earlier which modified some file your change has also modified.

You can either fetch your change to your local clone and rebase it on the latest upstream branch

or enable content merge for your project [1] and try to submit once more. Then you only have to

rebase locally in case you still get a merge conflict. 

[1] https://gerrit-review.googlesource.com/Documentation/project-configuration.html#submit_type

[Mohan Kumar]

Yes as per error message I have tried the below. On Command line executed

1.git pull
2.got rebase -i
It finished successfully.on Gerrit GUI user had totally five open gerrit review requests. Out (5). For (2) requests it says merged. Now I have (3) more requests for that also it says same error message. So I need to perform again the above steps? Plz advise.

[Matthias Sohn]

if your changes are pushed for the master branch the second step should be

$ git rebase origin/master

 resolve conflicts if any

$ git push origin HEAD:refs/for/master

 

--
--
To unsubscribe, email repo-discuss+unsubscribe@googlegroups.com
More info at http://groups.google.com/group/repo-discuss?hl=en

---
You received this message because you are subscribed to the Google Groups "Repo and Gerrit Discussion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to repo-discuss+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[Mohan Kumar]

No all the changes were pushed to gerrit earlier for private branch not to master. So in the above command instead of master i can change to our private branch and then i can push correct.

[Mohan Kumar]

Thanks a lot Matthias. I have resolved my running git rebase and git push.