Provide more information about merge progress in "arc land" under Git
ClosedPublic
Actions

Authored by epriestley on Jun 5 2020, 11:08 PM.

Details

Reviewers: None
Maniphest Tasks: T13546: Modernize the "arc land" workflow
Commits: rARC94f78cf87c78: Provide more information about merge progress in "arc land" under Git

Summary

Ref T13546. Communicate more progress information and provide additional details when merge conflicts occur.

Test Plan

Hit a merge conflict, saw more helpful output.

Repository

rARC Arcanist

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

epriestley requested review of this revision.Jun 5 2020, 11:09 PM

This revision was not accepted when it landed; it landed in state Needs Review.Jun 8 2020, 11:20 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

src/

land/

engine/

52 lines