Saltar al contenido principal

ADR-032 — Merge Authority (Javi Only)

Status: Approved | Date: 2026-06-18 | Scope: All repos, all contributors

Context

With multiple Claude Code sessions working in parallel across 17 plugin repos, and Joaquin reviewing from a product/clinical perspective, having multiple people merge to develop and main creates conflict risk and makes rollback harder.

Decision

Javi is the sole person who closes PRs and merges to develop and main in all obeliOmed repos.

What contributors (Claude Code sessions, other devs) do:

  1. Create a feature branch from develop
  2. Push commits to that branch
  3. Open a PR against develop
  4. Write REVIEW.md with a smoke test checklist
  5. Stop. Do not merge. Do not close the PR.

What Javi does:

  • Reviews the code and the REVIEW.md
  • Runs smoke tests
  • Merges (or requests changes)
  • Cuts releases on main

Anti-patterns to avoid

  • Asking "can I merge this?" or "should I merge?" — Javi decides
  • Self-merging a PR even if GitHub allows it
  • Pushing directly to develop (bypasses review)
  • Merging someone else's PR

Consequences

  • Single integration point prevents accidental conflicts
  • All code in develop has passed at least one human review
  • Release timing is fully controlled by Javi
  • Claude Code sessions can work in parallel without coordination overhead