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
F12849809: D21332.id50795.diff
Fri, Mar 29, 4:55 AM
Unknown Object (File)
Feb 20 2024, 7:02 PM
Unknown Object (File)
Feb 3 2024, 6:04 AM
Unknown Object (File)
Jan 30 2024, 9:01 PM
Unknown Object (File)
Jan 28 2024, 2:29 AM
Unknown Object (File)
Jan 19 2024, 3:50 AM
Unknown Object (File)
Jan 16 2024, 9:21 PM
Unknown Object (File)
Jan 11 2024, 12:39 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.