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)
Mon, Mar 4, 5:51 PM
Unknown Object (File)
Feb 21 2024, 6:40 PM
Unknown Object (File)
Feb 18 2024, 11:20 PM
Unknown Object (File)
Jan 17 2024, 3:34 PM
Unknown Object (File)
Jan 5 2024, 1:22 PM
Unknown Object (File)
Jan 3 2024, 6:41 PM
Unknown Object (File)
Dec 30 2023, 5:15 PM
Unknown Object (File)
Dec 26 2023, 6:34 PM
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.