Skip to content

fix: improve Devin conflict resolver for fork PRs and label cleanup #26655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keithwillcode merged 2 commits into from
Jan 10, 2026
Merged

fix: improve Devin conflict resolver for fork PRs and label cleanup #26655

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3602277
fix: improve Devin conflict resolver for fork PRs and label cleanup
keithwillcode Jan 10, 2026
41cf8f2
Update devin-conflict-resolver.yml
keithwillcode Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/devin-conflict-resolver.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,15 @@ jobs:
2. Test that the code still works after resolving conflicts (run lint/type checks).
3. Commit the merge resolution with a clear commit message.
4. Push the resolved changes to the PR branch.
5. After successfully pushing the resolved changes, remove the \`devin-conflict-resolution\` label from the PR using the GitHub API.

Rules and Guidelines:
1. Be careful when resolving conflicts - understand the context of both changes.
2. Follow the existing code style and conventions in the repository.
3. Run lint and type checks before pushing to ensure the code is valid.
4. If a conflict seems too complex or risky to resolve automatically, explain the situation in a PR comment instead.
5. Never ask for user confirmation. Never wait for user messages.`;
5. Never ask for user confirmation. Never wait for user messages.
6. CRITICAL: If this is a fork PR and you encounter ANY error when pushing (permission denied, authentication failure, etc.), you MUST fail the task immediately. Do NOT attempt to push to a new branch in the main ${owner}/${repo} repository as a workaround. Simply report the error and stop.`;

try {
const response = await fetch('https://api.devin.ai/v1/sessions', {
Expand Down