Add merge-conflict handling to mention-in-pr-no-sandbox prompt

[Copilot]

Summary

This PR syncs mention-in-pr-no-sandbox with the sandboxed variant for merge-conflict handling and mixed-request ordering.

What changed

• Updated Step 2 guidance in .github/workflows/gh-aw-mention-in-pr-no-sandbox.md to explicitly support combined requests and enforce execution order: merge conflicts first, then code/review changes, then a single push.
• Added an explicit If asked to fix merge conflicts branch covering:
  • fork-PR push limitation checks,
  • reading head/base branch context,
  • direct-edit conflict resolution (no git merge/git rebase),
  • a complexity fallback path for ambiguous/confidence-limited cases,
  • batching additional requested fixes before one final push,
  • and a final summary after pushing.
• Recompiled the workflow lock file in .github/workflows/gh-aw-mention-in-pr-no-sandbox.lock.yml via make compile.

Why

Prompt audit issue #513 identified drift where mention-in-pr-no-sandbox lacked the merge-conflict handling path present in mention-in-pr, which could lead to inconsistent behavior on mixed requests.

Fixes #513

Generated by Update PR Body for issue #514

[coderabbitai]

Warning

Rate limit exceeded

@strawgate has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 4 minutes and 17 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between 142ed71 and 01ea94f.

📒 Files selected for processing (2)

• .github/workflows/gh-aw-mention-in-pr-no-sandbox.lock.yml
• .github/workflows/gh-aw-mention-in-pr-no-sandbox.md

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch copilot/fix-merge-conflict-handling

---

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