Make "Land Revision" show merge conflicts more clearly
0b24a6e2006e
Actions

Authored by epriestley <git@epriestley.com> on Oct 26 2015, 21:11.

Description

Make "Land Revision" show merge conflicts more clearly

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:
{F910247}

{F910248}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T182

Committed

epriestley <autocommitter@example.com>

Oct 26 2015, 21:11

Pushed

aubort

Jan 31 2017, 17:16

Parents

Branches

Unknown

Tags

Unknown

epriestley <autocommitter@example.com> committed rPH0b24a6e2006e: Make "Land Revision" show merge conflicts more clearly (authored by epriestley <git@epriestley.com>).Oct 26 2015, 21:11

				Path
	M			src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
	M			src/applications/drydock/storage/DrydockRepositoryOperation.php
	M			src/applications/drydock/view/DrydockRepositoryOperationStatusView.php
	M			src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php