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

Jump to bottom
Merged
keithwillcode merged 2 commits into from
Jan 10, 2026
Merged

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

keithwillcode merged 2 commits into from
Jan 10, 2026

Conversation

@keithwillcode
Copy link
Contributor

@keithwillcode keithwillcode commented Jan 10, 2026

What does this PR do?

Updates the Devin PR Conflict Resolver workflow with two improvements:

  1. Label cleanup: Instructs Devin to remove the devin-conflict-resolution label from the PR after successfully resolving conflicts and pushing changes
  2. Fork error handling: Adds a CRITICAL rule that if Devin encounters any push error on a fork PR (permission denied, auth failure, etc.), it must fail immediately rather than attempting to push to a new branch in the main cal.com repository

Mandatory Tasks (DO NOT REMOVE)

  • I have self-reviewed the code (A decent size PR without self-review might be rejected).
  • I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. N/A - workflow changes only.
  • I confirm automated tests are in place that prove my fix is effective or that my feature works. N/A - prompt changes cannot be automatically tested.

How should this be tested?

These are prompt-based changes to the Devin workflow. To verify:

  1. Label removal: Trigger the workflow on a PR with conflicts, let Devin resolve them, and verify the devin-conflict-resolution label is removed after successful push
  2. Fork error handling: This is a safeguard - verify the instruction is clear by reviewing the prompt wording

Checklist

  • My code follows the style guidelines of this project
  • I have checked if my changes generate no new warnings

Note

This PR was created by Devin as requested by @keithwillcode

@keithwillcode @devin-ai-integration
fix: improve Devin conflict resolver for fork PRs and label cleanup
3602277 
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
@devin-ai-integration
Copy link
Contributor

devin-ai-integration bot commented Jan 10, 2026

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

  • Address comments on this PR that start with 'DevinAI' or '@devin'.
  • Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

  • Disable automatic comment and CI monitoring

@keithwillcode keithwillcode self-assigned this Jan 10, 2026
@keithwillcode keithwillcode added this to the v6.1 milestone Jan 10, 2026
@vercel
Copy link

vercel bot commented Jan 10, 2026

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

Project Deployment Review Updated (UTC)
cal-companion Building Building Preview, Comment Jan 10, 2026 0:07am

@keithwillcode keithwillcode marked this pull request as ready for review January 10, 2026 00:07
@keithwillcode keithwillcode requested a review from a team as a code owner January 10, 2026 00:07
@graphite-app graphite-app bot added core area: core, team members only foundation labels Jan 10, 2026
cubic-dev-ai[bot]
cubic-dev-ai bot reviewed Jan 10, 2026
View reviewed changes
Copy link
Contributor

@cubic-dev-ai cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 1 file

@keithwillcode keithwillcode enabled auto-merge (squash) January 10, 2026 00:11
@keithwillcode keithwillcode merged commit e4ead13 into main Jan 10, 2026
130 of 138 checks passed
@keithwillcode keithwillcode deleted the devin/devin-conflict-resolver-improvements-1768003234 branch January 10, 2026 02:43
Anshumancanrock pushed a commit to Anshumancanrock/cal.com that referenced this pull request Jan 12, 2026
@keithwillcode @devin-ai-integration @Anshumancanrock
fix: improve Devin conflict resolver for fork PRs and label cleanup (c…
52b4cb8 
…alcom#26655)

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

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* Update devin-conflict-resolver.yml

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cubic-dev-ai cubic-dev-ai[bot] cubic-dev-ai[bot] left review comments

@volnei volnei volnei approved these changes

@dhairyashiil dhairyashiil dhairyashiil approved these changes

Assignees

@keithwillcode keithwillcode

Labels

core area: core, team members only foundation ready-for-e2e size/XS

Projects

None yet

Milestone

v6.1

Development

Successfully merging this pull request may close these issues.

4 participants

@keithwillcode @volnei @dhairyashiil