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.
Details
Details
- Reviewers
- None
- Maniphest Tasks
- T13546: Modernize the "arc land" workflow
- Commits
- rARC7ddaed9aba1a: Improve "arc land" behavior in the presence of merge conflicts and change…
Ran "arc land" to land multiple changes. Hit better merge conflict messaging, then survived merge conflicts entirely.
Diff Detail
Diff Detail
- Repository
- rARC Arcanist
- Branch
- land33
- Lint
Lint Passed - Unit
Tests Passed - Build Status
Buildable 24597 Build 33916: Run Core Tests Build 33915: arc lint + arc unit