flaxo/ghost

decide merge cleanliness from merge-tree's exit statusVerifiedBrowse files at 6a96ac9

Gurpal committed 15 days ago · 5 changed files

A merge-tree exit of 1 is a conflict even when no paths could be read from its output, so mergeTree reports clean separately and the merge refuses anything not clean.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

apps/api/src/lib/git/merge/merge.spec.ts

apps/api/src/lib/git/merge/merge.ts

apps/api/src/resources/pull-requests/pull-requests.errors.ts

apps/api/src/resources/pull-requests/pull-requests.service.ts

apps/web/src/app/[username]/[repo]/pulls/[number]/page.client.tsx