Page MenuHomePhabricator

VisualEditor: Edit conflict message provides no button to actually resolve the conflict
Closed, ResolvedPublic

Description

.


Version: unspecified
Severity: major

Details

Reference
bz69150

Event Timeline

bzimport raised the priority of this task from to High.Nov 22 2014, 3:37 AM
bzimport set Reference to bz69150.

Change 156491 had a related patch set uploaded by Jforrester:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156491

Change 156491 merged by jenkins-bot:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156491

Change 156493 had a related patch set uploaded by Catrope:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156493

Change 156494 had a related patch set uploaded by Catrope:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156494

Change 156493 merged by jenkins-bot:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156493

Change 156494 merged by Catrope:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156494