Keith WilliamsandDevin AI 9c4ed1a303 fix(ci): improve conflict resolver prompt to prevent bad merge commits (#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>

2026-01-10 15:33:17 -03:00

..

all-checks.yml

chore: migrate GitHub workflows from Buildjet to Blacksmith (#26247)

2025-12-29 05:12:31 +00:00

api-v1-production-build.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

api-v2-production-build.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

api-v2-unit-tests.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

atoms-production-build.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

cache-clean.yml

chore: migrate GitHub workflows from Buildjet to Blacksmith (#26247)

2025-12-29 05:12:31 +00:00

changesets.yml

fix: specify atoms package.json repository (#24828)

2025-10-31 14:25:26 +00:00

check-api-v2-breaking-changes.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

check-types.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

cleanup-report.yml

fix(ci): use env vars for input interpolation in workflow run steps (#26520)

2026-01-06 22:56:59 +00:00

cleanup.yml

chore: replace GH_ACCESS_TOKEN with GitHub App token (#25518)

2025-12-16 14:12:56 +00:00

companion-build.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

cron-bookingReminder.yml

chore: cron workflow tidying (#10127)

2023-08-23 17:43:22 +05:30

cron-changeTimeZone.yml

feat: travel schedules to schedule timezone changes (#14512)

2024-04-12 17:57:28 +00:00

cron-checkSmsPrices.yml

feat: Credit System (SMS) (#20126)

2025-05-13 09:11:44 +02:00

cron-downgradeUsers.yml

chore: cron workflow tidying (#10127)

2023-08-23 17:43:22 +05:30

cron-monthlyDigestEmail.yml

fix: upgrade deprecated github actions (#14998)

2024-05-17 21:52:22 +00:00

cron-scheduleEmailReminders.yml

feat: move workflow emails to smtp (#20293)

2025-04-09 11:25:39 -07:00

cron-scheduleSMSReminders.yml

fix: GH based cronjobs in EU (#25992)

2025-12-26 11:43:28 +00:00

cron-scheduleWhatsappReminders.yml

fix: GH based cronjobs in EU (#25992)

2025-12-26 11:43:28 +00:00

cron-stale-issue.yml

refactor: update the config to auto close stale pr (#24701)

2025-10-26 23:28:38 +00:00

cron-syncAppMeta.yml

chore: cron workflow tidying (#10127)

2023-08-23 17:43:22 +05:30

cron-webhooks-triggers.yml

fix: GH based cronjobs in EU (#25992)

2025-12-26 11:43:28 +00:00

cubic-devin-review.yml

feat: companion alert system for browser extension (#26613)

2026-01-10 17:57:42 +05:30

delete-blacksmith-cache.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

devin-conflict-resolver.yml

fix(ci): improve conflict resolver prompt to prevent bad merge commits (#26699)

2026-01-10 15:33:17 -03:00

docs-build.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

draft-release.yml

fix(ci): use env vars for input interpolation in workflow run steps (#26520)

2026-01-06 22:56:59 +00:00

e2e-api-v2.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

e2e-app-store.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

e2e-atoms.yml

chore: migrate GitHub workflows from Buildjet to Blacksmith (#26247)

2025-12-29 05:12:31 +00:00

e2e-embed-react.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

e2e-embed.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

e2e-report.yml

fix: search by branch instead of SHA in E2E report workflow_dispatch (#26168)

2025-12-23 20:51:14 +00:00

e2e.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

i18n.yml

chore: migrate GitHub workflows from Buildjet to Blacksmith (#26247)

2025-12-29 05:12:31 +00:00

integration-tests.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

labeler.yml

chore: Remove team-labels action (#25862)

2025-12-14 14:31:13 +00:00

lint.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

merge-reports.yml

ci: make E2E report jobs non-blocking by moving to separate workflow (#26157)

2025-12-23 19:16:36 +00:00

nextjs-bundle-analysis-annotation.yml

chore: migrate GitHub workflows from Buildjet to Blacksmith (#26247)

2025-12-29 05:12:31 +00:00

nextjs-bundle-analysis.yml

chore: delete cached build after bundle analysis completes (#26689)

2026-01-10 15:01:21 -03:00

on-changes-requested.yml

chore: Upgrade actions/upload-artifact to v4 (#18160)

2024-12-13 11:32:50 +00:00

performance-tests.yml

test: Performance tests suite (#21226)

2025-08-26 09:16:19 -03:00

post-release.yml

chore: replace GH_ACCESS_TOKEN with GitHub App token (#25518)

2025-12-16 14:12:56 +00:00

pr.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

production-build-without-database.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

publish-report.yml

fix(ci): use env vars for input interpolation in workflow run steps (#26520)

2026-01-06 22:56:59 +00:00

re-draft.yml

ci: Re-drafts PR when changes are requested (#17137)

2024-11-21 00:59:11 +00:00

release-docker.yaml

feat: companion alert system for browser extension (#26613)

2026-01-10 17:57:42 +05:30

run-ci.yml

fix: remove installation requirement from trusted bot check (#26466)

2026-01-05 15:19:39 +00:00

semantic-pull-requests.yml

Update semantic-pull-requests.yml (#15421)

2024-06-13 14:00:44 +00:00

setup-db.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00

stale-pr-devin-completion.yml

fix: parsing error in stale PR workflow for workflow_dispatch (#26691)

2026-01-10 15:00:52 -03:00

unit-tests.yml

feat: implement git checkout caching to speed up CI workflows (#26636)

2026-01-10 21:46:21 +09:00