Reconcile promotion history with main - #96
Merged
Conversation
Promote the validated workflow, security, governance, and licensing changes from develop to main.
* Consolidate dependency security upgrades * Fix clean-checkout build import linting * Stabilize thumbnail column resizing
Squash promotions leave main's history disconnected from develop, so direct develop-to-main pull requests conflict on every overlapping hunk. Recording main as merged (keeping develop's tree unchanged) moves the merge base forward and lets promotions merge cleanly.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Squash promotions leave main's history disconnected from develop, so direct develop → main PRs (like #94) conflict on every overlapping hunk and out-of-repo promotion branches (like #95) violate the branch policy.
This records main as merged into develop using the
oursstrategy — the tree is byte-identical to develop (zero file changes), but main becomes an ancestor, moving the merge base forward so the follow-up develop → main promotion merges cleanly.Must be merged with a merge commit, not squash — squashing would discard the ancestry that makes this work.