Repository navigation
gh-prs-merge --fix: resolve lockfile-only conflicts instead of skipping (0.69.0) - #197
Merged
Merged
Conversation
…ng (0.69.0) A DIRTY PR whose only conflicting files are bun.lock(b), pnpm-lock.yaml or package-lock.json is not two authors disagreeing: both sides bumped deps and the merged package.json already says what each wanted. --fix now merges the base in a blobless clone under ~/.cache, takes the base's lockfile, rebuilds it lockfile-only with --ignore-scripts, pushes the merge commit (never a force push) and parks the PR for CI. Forks, moved heads, code conflicts and refused pushes stay FIXME, now naming the reason. Seen on rssamplifier.com#241: skipped as mergeable=CONFLICTING over bun.lock alone. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ThreatCrush Security Scan33 finding(s) HIGH/CRITICAL: 7 | MEDIUM: 12 | LOW: 14
Snippets are redacted; ThreatCrush never prints matched credential material. |
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
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.
gh-prs-merge-allskipped rssamplifier.com#241 asmergeable=CONFLICTINGwhen the only conflict wasbun.lock. That had to be fixed by hand.What changed: under
--fix, a DIRTY PR whose only conflicting files are lockfiles is repaired:~/.cache/gh-prs-merge(not /tmp), then merge the base inbun|pnpm install --lockfile-only --ignore-scriptsornpm install --package-lock-only --ignore-scriptsThese cases stay FIXME and now print the reason: fork PRs, a head that moved, any non-lockfile conflict, a refused push. yarn.lock is excluded because classic yarn has no lockfile-only mode.
Tested:
test/proxy.test.ts, which fails on master too🤖 Generated with Claude Code