Skip to content

fix(github): End merge conflict fix Turns with no reply - #3837

Closed
sentry-junior[bot] wants to merge 4 commits into
mainfrom
fix/no-merge-conflict-notice
Closed

sentry-junior[bot] wants to merge 4 commits into
mainfrom
fix/no-merge-conflict-notice

Conversation

@sentry-junior

@sentry-junior sentry-junior Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Refs #3702.

A merge conflict fix on a Junior pull request is routine upkeep, so a person needs no message when it lands. The pull_request.merge_conflict guidance tells the agent to end the Turn with noReply after the fix. The agent posts in the thread only when it cannot fix the conflict and a person must act.

The conflict policy does not change: when Junior fixes, and when it stops fixing. #3709 owns what a person sees when fixes stop. #3841 records the rule.

via @dcramer, @BYK.

--

View Session [Sentry]

A merge conflict on a Junior pull request is Junior's own work, so it
gives a person no next step. Drop the review desk notice that the policy
added when it stopped fixing. The fix window now covers the 3 days after
the latest activity by a person; past it, or past the fix limit, Junior
does nothing and tells nobody. The merge conflict guidance tells the
agent to end the Turn with noReply once the fix lands.

Record the rule in AGENTS.md and a new design/notifications.md: notify a
person only when they have a next step.

Co-Authored-By: David Cramer <23610+dcramer@users.noreply.github.com>
@vercel

vercel Bot commented Nov 19, 2026 •

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
junior-docs Ready Ready Preview Nov 19, 2026 11:07pm UTC

Request Review

The rule and design/notifications.md land separately. This pull request
only closes the merge conflict gaps that the rule records.

Co-Authored-By: David Cramer <23610+dcramer@users.noreply.github.com>
sentry-junior Bot and others added 2 commits November 19, 2026 23:06
…-notice

Co-Authored-By: Burak Yigit Kaya <126780+BYK@users.noreply.github.com>
Restore the merge conflict policy, so #3709 owns what
happens when automatic fixes stop. This pull request only tells the agent
to end the Turn with noReply after a conflict fix lands.

Co-Authored-By: Burak Yigit Kaya <126780+BYK@users.noreply.github.com>
@sentry-junior sentry-junior Bot changed the title fix(github): Send merge conflicts to the agent and never notify a person fix(github): End merge conflict fix Turns with no reply Nov 19, 2026
@sentry-junior
sentry-junior Bot marked this pull request as ready for review November 19, 2026 23:18
@sentry-junior
sentry-junior Bot requested a review from dcramer November 19, 2026 23:18
@github-actions github-actions Bot added the risk: medium PR risk score: medium label Nov 19, 2026
@dcramer

dcramer commented Nov 20, 2026

Copy link
Copy Markdown
Member

closing this for now as theres been changes and idk if this is resolved or not. lets figure out if there are still gaps and come up with one comprehensive approach if so

@dcramer dcramer closed this Nov 20, 2026

This branch was successfully deployed

1 active deployment
Preview – junior-docs — a0e311b0 Deployed Nov 19, 2026 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk: medium PR risk score: medium

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant