Ref T13546. When users hit a situation where we would select "squash" but would previously select "merge", prevent them from continuing under ambiguous conditions.
Details
Details
- Reviewers
- None
- Maniphest Tasks
- T13546: Modernize the "arc land" workflow
- Commits
- rARC78e9cc9c0129: Add a check for ambiguous merge strategies after the "history.immutable"…
Ran "arc land" in Git with "history.immutable" true, false, and not configured.
Diff Detail
Diff Detail
- Repository
- rARC Arcanist
- Branch
- land25
- Lint
Lint Passed Severity Location Code Message Advice src/land/engine/ArcanistGitLandEngine.php:1435 XHP16 TODO Comment - Unit
Tests Passed - Build Status
Buildable 24584 Build 33894: Run Core Tests Build 33893: arc lint + arc unit