Repository navigation
fix(github): End merge conflict fix Turns with no reply - #3837
Closed
sentry-junior[bot] wants to merge 4 commits into
Closed
sentry-junior[bot] wants to merge 4 commits into
sentry-junior[bot] wants to merge 4 commits into
Conversation
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>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
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>
…-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>
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 |
This branch was successfully deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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_conflictguidance tells the agent to end the Turn withnoReplyafter 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]