Page MenuHomePhabricator

Make "Land Revision" show merge conflicts more clearly
ClosedPublic

Authored by epriestley on Oct 26 2015, 6:23 PM.
Tags
None
Referenced Files
F14879962: D14343.id34628.diff
Sat, Feb 8, 11:37 PM
Unknown Object (File)
Tue, Feb 4, 1:05 AM
Unknown Object (File)
Tue, Jan 28, 4:18 PM
Unknown Object (File)
Mon, Jan 27, 9:25 PM
Unknown Object (File)
Mon, Jan 27, 9:25 PM
Unknown Object (File)
Mon, Jan 27, 9:25 PM
Unknown Object (File)
Mon, Jan 27, 9:25 PM
Unknown Object (File)
Mon, Jan 27, 9:25 PM
Subscribers
None

Details

Summary

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

Repository
rP Phabricator
Branch
workmerge4
Lint
Lint Passed
Unit
Tests Passed
Build Status
Buildable 8422
Build 9681: Run Core Tests
Build 9680: arc lint + arc unit

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.