fix(ci): improve conflict resolver prompt to prevent bad merge commits#26699
Merged
keithwillcode merged 1 commit intomainfrom Jan 10, 2026
Merged
Conversation
- Remove explicit git commands from the prompt to avoid Devin reproducing changes - Add validation step before pushing to detect if merge commit incorrectly includes changes from target branch - Add guidance to use git's merge functionality properly instead of manually copying content - Add rule to never reproduce or recreate changes from the target branch Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Contributor
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
Contributor
Author
|
Bypassing Foundation codeowner as I am part of Foundation, we have an approver and this change is low risk. |
keithwillcode
deleted the
devin/conflict-resolver-prompt-fix-1768069373
branch
Anshumancanrock
pushed a commit
to Anshumancanrock/cal.com
that referenced
this pull request
Jan 12, 2026
calcom#26699) - Remove explicit git commands from the prompt to avoid Devin reproducing changes - Add validation step before pushing to detect if merge commit incorrectly includes changes from target branch - Add guidance to use git's merge functionality properly instead of manually copying content - Add rule to never reproduce or recreate changes from the target branch Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
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
2 participants
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.
What does this PR do?
Fixes an issue where the Devin conflict resolver was creating merge commits that reproduced all changes from the target branch instead of properly merging them. This was observed in PR #26117 where the merge commit showed thousands of file changes that were already in main.
Changes:
git diff --stat HEAD^1...HEADandHEAD^2...HEADbefore pushingMandatory Tasks (DO NOT REMOVE)
How should this be tested?
This is a prompt change for the Devin conflict resolver workflow. To test:
Human Review Checklist
HEAD^1(PR branch parent) andHEAD^2(base branch parent) is correct for detecting bad mergesChecklist
Link to Devin run: https://app.devin.ai/sessions/26e3a13396064e4b871cbf0dd00ffcb0
Requested by: @keithwillcode