🧱 Mason: [Add Master Conflict Resolver Prompt]

[fderuiter]

Adds the master-conflict-resolver prompt to the devops prompts directory to handle complex git merge and rebase scenarios.

---

PR created automatically by Jules for task 16651975780087154400 started by @fderuiter

[google-labs-jules]

👋 Jules, reporting for duty! I'm here to lend a hand with this pull request.

When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down.

I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job!

For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with @jules. You can find this option in the Pull Request section of your global Jules UI settings. You can always switch back!

New to Jules? Learn more at jules.google/docs.

---

For security, I will only act on instructions from the user who triggered this task.

[coderabbitai]

Warning

Review limit reached

@fderuiter, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 59 minutes

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 37fc00cc-a0e3-4ebb-9dca-60ad033a57ac

📥 Commits

Reviewing files that changed from the base of the PR and between 8801c7b and 2b81873.

📒 Files selected for processing (1)

• prompts/technical/devops/master_conflict_resolver.prompt.yaml

📝 Walkthrough

Summary by CodeRabbit

• New Features
  • Added a DevOps assistant prompt for resolving merge, rebase, and cherry-pick conflicts.
  • Includes guidance for handling ambiguous changes, lockfiles, conflict markers, verification, and complete file output.
  • Added basic test data to validate the prompt’s identity section.

Walkthrough

Adds a master-conflict-resolver DevOps prompt configuration. The prompt covers Git conflict operations, lockfiles, binary files, deletions, conflict synthesis, verification, staging, finalization, and identity test data.

Changes

Conflict resolution prompt

Layer / File(s)	Summary
Conflict resolution workflow prompts/technical/devops/master_conflict_resolver.prompt.yaml	Adds the complete prompt definition for merge, rebase, and cherry-pick conflict handling. It includes diagnostic steps, edge-case rules, zdiff3 synthesis instructions, verification requirements, finalization steps, and identity test data.

Estimated code review effort: 2 (Simple) | ~10 minutes

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch add-master-conflict-resolver-16651975780087154400

✨ Simplify code

• Create PR with simplified code
• Commit simplified code in branch add-master-conflict-resolver-16651975780087154400

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}