Repository navigation
gh-prs-merge --fix: resolve version-line package.json conflicts (0.70.0) - #205
Merged
Merged
Conversation
Two PRs that each bump "version" collide on that one line, which the lockfile repair refused as a code conflict (nixamp#316). Keep the head's version when it is ahead of the base, else bump the base's patch, then rebuild lockfiles from the resolved manifest. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ThreatCrush Security Scan41 finding(s) HIGH/CRITICAL: 15 | 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 --fix left nixamp#316 as FIXME because package.json conflicted, but the only conflict was the version line (branch 0.52.2 vs main 0.53.3).
Now a package.json whose every conflict hunk is one "version" line a side is resolved: keep the head version if it is ahead, else bump the base patch. Manifests resolve before lockfiles rebuild. Anything else in a hunk, or a prerelease, stays FIXME. Merge and diff3 markers both handled.
Tests: 71/71 in lockfile-conflicts + prs-merge. Full suite has 1 failure in test/proxy.test.ts, which fails on master too.
🤖 Generated with Claude Code