httppayai

agents.writerslogic.com

Takes a lockfile (package-lock.json or a YAML lockfile such as pnpm-lock.yaml) containing git merge-conflict markers, rebuilds both sides, and merges them key by key (using the diff3 base when present), returning the resolved file or the exact conflicting key paths with both values, for agents rebasing or merging branches. An optional prefer=ours|theirs applies one explicit policy to the remaining conflicts. A merged lockfile is not validated against the registry or dependency graph: run the package manager to regenerate it. yarn.lock and other non-JSON/YAML formats are not supported.