Sync fork ancestry with upstream/main (no code changes)#53
Merged
aaditagrawal merged 9 commits intomainfrom Apr 5, 2026
Merged
Sync fork ancestry with upstream/main (no code changes)#53aaditagrawal merged 9 commits intomainfrom
aaditagrawal merged 9 commits intomainfrom
Conversation
…text (pingdotgg#1518) Co-authored-by: codex <codex@users.noreply.github.com> Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Julius Marminge <juliusmarminge@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Hwanseo Choi <hwanseoc@nvidia.com> Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
github-actions
bot
added
vouch:trusted
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
3 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
Performs a
git merge upstream/main --strategy oursto synchronize the fork DAG with upstream without changing any code.Why
GitHub shows the fork as "N commits behind" upstream even though all upstream changes have already been cherry-picked into the fork (via PRs #45-#52). This is because cherry-picking creates new commits rather than sharing ancestry with upstream. This merge commit tells git that upstream's history has been incorporated, resolving the "commits behind" counter.
Changes
Zero files changed. This is a no-op merge (
--strategy ours) that only creates a merge commit to reconcile the commit graph.Important
This PR should be merged AFTER PRs #51 and #52 (the cherry-picks for upstream pingdotgg#1746 and pingdotgg#1747) to ensure all upstream content is incorporated before marking the ancestry as synced.