Skip to content

add NO_DEEP_MERGE_HISTORY env - to allow only history-merges up to 2-steps#19553

Merged
AskAlexSharov merged 1 commit intomainfrom
alex/no_merge_2_34
Mar 2, 2026
Merged

add NO_DEEP_MERGE_HISTORY env - to allow only history-merges up to 2-steps#19553
AskAlexSharov merged 1 commit intomainfrom
alex/no_merge_2_34

Conversation

@AskAlexSharov
Copy link
Collaborator

@AskAlexSharov AskAlexSharov commented Mar 2, 2026

fast merges, less impact on exec, less disk space (10x for comm history)

@AskAlexSharov AskAlexSharov marked this pull request as ready for review March 2, 2026 03:05
@AskAlexSharov AskAlexSharov enabled auto-merge (squash) March 2, 2026 03:05
Copy link
Collaborator

@Giulio2002 Giulio2002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM — simple env var addition for NO_DEEP_MERGE_HISTORY with a clean 3-line guard in findMergeRange

@AskAlexSharov AskAlexSharov merged commit 99fa127 into main Mar 2, 2026
33 of 41 checks passed
@AskAlexSharov AskAlexSharov deleted the alex/no_merge_2_34 branch March 2, 2026 07:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants