Page MenuHomePhabricator

Improve "arc land" behavior in the presence of merge conflicts and change sequences

Authored by epriestley on Jun 8 2020, 10:42 PM.



Ref T13546. When we encounter a merge conflict, suggest "--incremental" if it's likely to help.

When merging multiple changes, rebase ranges before merging them. This reduces conflicts when landing sequences of changes.

Test Plan

Ran "arc land" to land multiple changes. Hit better merge conflict messaging, then survived merge conflicts entirely.

Diff Detail

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

Event Timeline

epriestley created this revision.Jun 8 2020, 10:42 PM
epriestley requested review of this revision.Jun 8 2020, 10:43 PM
This revision was not accepted when it landed; it landed in state Needs Review.Jun 8 2020, 11:30 PM
This revision was automatically updated to reflect the committed changes.