Page MenuHomePhabricator

Gerrit Index inconsistent
Closed, DeclinedPublic

Description

Hi, viewing this https://gerrit.wikimedia.org/r/#/q/status:open i am seeing some of my changes as merge conflict. But they couldn't be as i just rebased them. Going into the patch shows no merge conflict. So this looks like index inconsistency.

See the image below

Notice how "PHPSessionHandler: Workaround PHP5 bug" on branch REL1_28 shows a merge conflict on status:open page but shows no merge conflict on the actual patch.

Event Timeline

Paladox created this task.Apr 1 2017, 9:49 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptApr 1 2017, 9:49 PM
Paladox updated the task description. (Show Details)Apr 1 2017, 9:50 PM
Paladox closed this task as Declined.Apr 1 2017, 9:54 PM

It seems gerrit has supper powers and managed to figure out a merge conflict just as a change was being merged.