chore: record reverted main ancestry for v2026.07.15#563
Merged
Conversation
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
2 participants
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.
Summary
mainhistory as an ancestor ofdevdevfile tree unchangedWhy
After a merged release is reverted, Git considers the original release commits already integrated and then undone. A direct
dev -> mainPR therefore conflicts even thoughdevcontains the intended release tree.This ancestry-only merge follows the repository's established PR #479 pattern. It resolves the history relationship in favor of the current
devtree without changing any files.Validation
origin/mainis an ancestor of the merge commitorigin/devtree:838d1d45da85de143bf31de420b5dfb11e8ca8bcgit diff --stat origin/dev..HEADis emptyThis PR must be merged using Create a merge commit, not squash or rebase.