Page MenuHomePhabricator

Add a check for ambiguous merge strategies after the "history.immutable" behavioral change
ClosedPublic

Authored by epriestley on Jun 8 2020, 1:40 PM.
Tags
None
Referenced Files
F15548200: D21332.id50795.diff
Sat, Apr 26, 10:26 PM
F15542001: D21332.id.diff
Fri, Apr 25, 2:56 PM
F15537522: D21332.diff
Thu, Apr 24, 2:23 PM
F15520382: D21332.diff
Sun, Apr 20, 6:03 AM
F15516735: D21332.id50762.diff
Fri, Apr 18, 9:00 PM
F15497661: D21332.id.diff
Sun, Apr 13, 10:55 AM
F15497600: D21332.diff
Sun, Apr 13, 10:47 AM
F15442883: D21332.id50795.diff
Mar 27 2025, 1:05 AM
Subscribers
None

Details

Summary

Ref T13546. When users hit a situation where we would select "squash" but would previously select "merge", prevent them from continuing under ambiguous conditions.

Test Plan

Ran "arc land" in Git with "history.immutable" true, false, and not configured.

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:26 PM
This revision was automatically updated to reflect the committed changes.