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
Unknown Object (File)
Jun 5 2025, 4:58 PM
Unknown Object (File)
May 7 2025, 10:06 AM
Unknown Object (File)
Apr 27 2025, 4:35 PM
Unknown Object (File)
Apr 26 2025, 10:26 PM
Unknown Object (File)
Apr 25 2025, 2:56 PM
Unknown Object (File)
Apr 24 2025, 2:23 PM
Unknown Object (File)
Apr 20 2025, 6:03 AM
Unknown Object (File)
Apr 18 2025, 9:00 PM
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.