Skip to content

Fix non-interactive merge overwrite fallback - #20

Merged
razvantomegea merged 2 commits into
mainfrom
cursor/critical-bug-inspection-6e31
Apr 30, 2026
Merged

Fix non-interactive merge overwrite fallback#20
razvantomegea merged 2 commits into
mainfrom
cursor/critical-bug-inspection-6e31

Conversation

@cursor

@cursor cursor Bot commented Apr 30, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Prevent merge-mode writes without a merge callback from overwriting existing files; they now skip and are listed in update output.
  • Attach safe merge callbacks for managed root AGENTS/CLAUDE files and .claude/settings.json.
  • Harden JSON merging against prototype pollution and keep generator-controlled safety settings authoritative.

Validation

  • corepack pnpm check-types
  • corepack pnpm test
  • corepack pnpm lint
Open in Web View Automation 

cursoragent and others added 2 commits April 30, 2026 04:22
@cursoragent @razvantomegea
Fix merge mode overwrite fallback
da899c6 
Co-authored-by: Razvan Tomegea <razvantomegea@users.noreply.github.com>
@cursoragent @razvantomegea
Harden JSON merge safety controls
f40f37e 
Co-authored-by: Razvan Tomegea <razvantomegea@users.noreply.github.com>
@razvantomegea
razvantomegea marked this pull request as ready for review April 30, 2026 10:05
@razvantomegea
razvantomegea merged commit 4d58c93 into main Apr 30, 2026
1 check passed
@razvantomegea
razvantomegea deleted the cursor/critical-bug-inspection-6e31 branch April 30, 2026 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@razvantomegea @cursoragent