Page MenuHomePhabricator

Make "Land Revision" show merge conflicts more clearly

Authored by epriestley on Oct 26 2015, 6:23 PM.



Ref T182. We just show "an error happened" right now. Improve this behavior.

This error handling chain is a bit ad-hoc for now but we can formalize it as we hit other cases.

Test Plan

Screen Shot 2015-10-26 at 11.08.05 AM.png (548×1 px, 106 KB)

Screen Shot 2015-10-26 at 11.08.06 AM.png (548×1 px, 89 KB)

Diff Detail

rP Phabricator
Lint Not Applicable
Tests Not Applicable

Event Timeline

epriestley retitled this revision from to Make "Land Revision" show merge conflicts more clearly.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added a reviewer: chad.
chad edited edge metadata.
This revision is now accepted and ready to land.Oct 26 2015, 7:10 PM
This revision was automatically updated to reflect the committed changes.