Auto-resolve merge conflicts in upstream sync - #5
Merged
Merged
Conversation
When the merge has conflicts, automatically resolve files that the fork never customizes: - docs/ — generated reference docs (take upstream, autofix CI regenerates) - .github/workflows/release.yml — deleted in fork (keep deleted) - packages/*/CHANGELOG.md — upstream changelogs (take upstream) - pnpm-lock.yaml — lockfile (take upstream) - examples/**/package.json — example deps (take upstream) If any conflicts remain outside these categories, the workflow aborts with a clear error listing the files that need manual intervention. Auto-resolved files are listed in the PR body for visibility. https://claude.ai/code/session_01QCPv9A7pkCeR42zoJ9fujU
After taking upstream's pnpm-lock.yaml during conflict resolution, run pnpm install --no-frozen-lockfile to incorporate any fork-specific dependencies from our root package.json. Adds the tanstack/config setup step so pnpm and Node are available for this. https://claude.ai/code/session_01QCPv9A7pkCeR42zoJ9fujU
dogmar
force-pushed
the
claude/fix-upstream-merge-automation-73Ctv
branch
from
March 27, 2026 22:55
8c3ce85 to
38a40f4
Compare
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.
Summary
pnpm install --no-frozen-lockfileto reconcile with fork's root package.jsontanstack/configsetup step so pnpm/Node are available for lockfile reconciliationAuto-resolution rules
docs/*.github/workflows/release.ymlpublish-fork.ymlpackages/*/CHANGELOG.mdpnpm-lock.yamlpnpm installexamples/**/package.jsonTest plan
https://claude.ai/code/session_01QCPv9A7pkCeR42zoJ9fujU