Skip to content

chore: Improve Devin prompt for resolving conflicts #26714

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 11, 2026
Merged

chore: Improve Devin prompt for resolving conflicts #26714

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f91ece3
chore: Improve Devin prompt for resolving conflicts
keithwillcode Jan 11, 2026
38cf5f0
Merge branch 'main' into chore/update-conflict-prompt
devin-ai-integration[bot] Jan 11, 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
55 changes: 28 additions & 27 deletions .github/workflows/devin-conflict-resolver.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
script: |
const { owner, repo } = context.repo;
const manualPrNumber = process.env.INPUT_PR_NUMBER ? parseInt(process.env.INPUT_PR_NUMBER, 10) : null;

const query = `
query($owner: String!, $repo: String!, $cursor: String) {
repository(owner: $owner, name: $repo) {
Expand Down Expand Up @@ -66,58 +66,58 @@ jobs:
}
}
`;

const allPRs = [];
let cursor = null;

do {
const result = await github.graphql(query, { owner, repo, cursor });
const { nodes, pageInfo } = result.repository.pullRequests;
allPRs.push(...nodes);
cursor = pageInfo.hasNextPage ? pageInfo.endCursor : null;
} while (cursor);

console.log(`Found ${allPRs.length} open PRs via GraphQL`);

if (manualPrNumber) {
console.log(`Manual PR number provided: ${manualPrNumber}`);
}

const conflictingPRs = [];
const unknownPRs = [];

function processPR(pr, mergeableStatus) {
const isTargetPR = manualPrNumber && pr.number === manualPrNumber;
const isFork = pr.headRepository?.owner?.login !== owner;

if (!isTargetPR && pr.isDraft) {
console.log(`PR #${pr.number} is a draft, skipping`);
return { skip: true };
}

if (!isTargetPR && isFork) {
console.log(`PR #${pr.number} is from a fork, skipping`);
return { skip: true };
}

if (!isTargetPR) {
const hasDevinLabel = pr.labels.nodes.some(label => label.name === 'devin-conflict-resolution');
if (hasDevinLabel) {
console.log(`PR #${pr.number} already has devin-conflict-resolution label, skipping`);
return { skip: true };
}
}

if (mergeableStatus === 'CONFLICTING' || (isTargetPR && mergeableStatus !== 'MERGEABLE')) {
const headRepoOwner = pr.headRepository?.owner?.login || owner;
const headRepoName = pr.headRepository?.name || repo;

if (isTargetPR) {
console.log(`PR #${pr.number} manually targeted for conflict resolution${isFork ? ' (from fork)' : ''}`);
} else {
console.log(`PR #${pr.number} has conflicts`);
}

return {
conflict: true,
data: {
Expand All @@ -140,10 +140,10 @@ jobs:
return { skip: true };
}
}

for (const pr of allPRs) {
const result = processPR(pr, pr.mergeable);

if (result.conflict) {
conflictingPRs.push(result.data);
if (result.isTargetPR) break;
Expand All @@ -152,18 +152,18 @@ jobs:
unknownPRs.push(pr);
}
}

if (unknownPRs.length > 0) {
console.log(`\n${unknownPRs.length} PRs have UNKNOWN mergeable status, retrying via REST API...`);

for (const pr of unknownPRs) {
try {
const { data } = await github.rest.pulls.get({
owner,
repo,
pull_number: pr.number
});

let mergeableStatus;
if (data.mergeable === true) {
mergeableStatus = 'MERGEABLE';
Expand All @@ -172,9 +172,9 @@ jobs:
} else {
mergeableStatus = 'UNKNOWN';
}

console.log(`PR #${pr.number} retry result: mergeable=${mergeableStatus}`);

const result = processPR(pr, mergeableStatus);
if (result.conflict) {
conflictingPRs.push(result.data);
Expand All @@ -187,22 +187,22 @@ jobs:
}
}
}

if (manualPrNumber && conflictingPRs.length === 0) {
console.log(`Warning: PR #${manualPrNumber} not found or has no conflicts`);
}

const MAX_PRS = 15;
if (conflictingPRs.length > MAX_PRS) {
console.log(`Warning: Found ${conflictingPRs.length} PRs with conflicts, limiting to ${MAX_PRS} for safety`);
conflictingPRs.length = MAX_PRS;
}

console.log(`Found ${conflictingPRs.length} PRs with conflicts that need Devin sessions`);

const fs = require('fs');
fs.writeFileSync('/tmp/conflicting-prs.json', JSON.stringify(conflictingPRs));

core.setOutput('has-conflicts', conflictingPRs.length > 0 ? 'true' : 'false');
core.setOutput('conflict-count', conflictingPRs.length.toString());

Expand Down Expand Up @@ -315,7 +315,7 @@ jobs:

Your tasks:
${forkInstructions}

Then:
1. Resolve all merge conflicts carefully:
- Review the conflicting changes from both branches
Expand All @@ -336,6 +336,7 @@ jobs:

Rules and Guidelines:
1. Be careful when resolving conflicts - understand the context of both changes.
To help with this, try to find the recent PRs associated with the conflicting files to gain more context.
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.
Expand Down Expand Up @@ -440,6 +441,6 @@ jobs:
} catch (error) {
console.error(`Error handling Devin session for PR #${pr.number}: ${error.message}`);
}

await new Promise(resolve => setTimeout(resolve, 1000));
}
Loading