CODEWITHSUNDEEP
gitgerritmerge-conflict-resolutiongit-merge-conflict
imox
imox

Reputation: 1554

Gerrit UI showing status as merge conflict even when there is no conflict

One of my outgoing review was showing merge conflict (not submitted, in process). I fetched the latest from master and then merged that with my feature branch and updated my change list on gerrit. But it is still showing merge conflict.

I have looked into the files and I have grepped the whole directory for <<<<<<< HEAD . But I could not find any conflict.

enter image description here

Upvotes: 4

Views: 3909

Answers (2)

HereAndBeyond
HereAndBeyond

Reputation: 1454

I had same problem some days ago. In my case, after merging I have made git reset --soft HEAD~ which transfered my changes from "commited" to "staged". Then I have commited them again and it worked. It was strange behavior but it is never happened again.

Upvotes: 1

VonC
VonC

Reputation: 1324937

I have looked into the files

Those would be your files locally, which haven't been merged.

As in "How to solve merge conflict in a approved review in gerrit?", fetch the changeset, rebase it locally onto origin/<yourBranch>: you should see conflicts there.

The idea is to resolve conflicts locally, then push back the modified changeset.

Upvotes: 1

Related Questions