Page MenuHomePhabricator

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

Authored by epriestley on Jun 8 2020, 10:42 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, May 6, 5:48 PM
Unknown Object (File)
Apr 29 2025, 12:11 AM
Unknown Object (File)
Apr 26 2025, 5:36 AM
Unknown Object (File)
Apr 25 2025, 7:14 PM
Unknown Object (File)
Apr 24 2025, 6:24 PM
Unknown Object (File)
Apr 13 2025, 10:42 AM
Unknown Object (File)
Apr 13 2025, 10:38 AM
Unknown Object (File)
Apr 13 2025, 10:34 AM
Subscribers
None

Details

Summary

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

Repository
rARC Arcanist
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

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.