Accept ADR-0070 and close the branch-refresh gap it left open

[Reefact]

Summary

Accepts ADR-0070, then settles the one point it deliberately left open: CONTRIBUTING.md still allowed merging origin/main into an open branch, which recreates exactly the commits the linear history removed. ADR-0071 records that decision — also accepted — and the rule is rewritten to rebase-only.

Type of change

• Documentation

Changes

• Accept ADR-0070. Status: Accepted, Accepted: 2026-08-10 added below the untouched Proposed: line per ADR-0057, and the index Status column updated.
• Record ADR-0071 (English canonical + French translation), accepted the day it was written, and index it. It states that an open branch is brought up to date only by rebasing it onto origin/main, and why:
  • 87 of the 401 merge commits ADR-0070 removed were the Merge branch 'main' into … shape this rule produces — and 15 of those carried a hand-made conflict resolution, which was the delicate part of the rewrite;
  • under Rebase and merge the rule no longer does what it says: GitHub replays the branch's own commits onto main, so a merge performed on a branch now travels with it instead of staying behind;
  • the protection it offered — not discarding a collaborator's pulled work — assumes a shared branch, which this repository's own doctrine (one pull request, one owner named in the ref, cut fresh, deleted on merge) does not have.
• Rewrite the rule in CONTRIBUTING.md and its French translation: rebase onto origin/main, never merge origin/main in; if someone else has based work on the branch, coordinate the force-push or split the work rather than reaching for a merge.

Testing

Documentation-only change; no code is touched, so the build and test commands were not run for this branch. What was verified instead:

• no statement of the merge alternative survives anywhere in the documentation;
• ADR-0071's English and French records are structurally symmetric (4 sections and 5 subsections each) and all their cross-links resolve;
• each commit stands alone — the index gains ADR-0071's row in the same commit that adds the record, not before;
• all three commit headers pass tools/commit-lint/lint-commit-message.sh --ci.

Documentation

• README / doc/ updated
• French translation updated — ADR-0071 ships as .md and .fr.md, and doc/handwritten/for-users/CONTRIBUTING.fr.md carries the same rule change

Architecture decisions

• New decision recorded — ADR: ADR-0071

Both ADRs are Accepted on your explicit instruction, so ADR-0071 lands already accepted rather than as a proposal followed by a same-day acceptance commit. Its Proposed: and Accepted: lines both read 2026-08-10, which is what ADR-0057 prescribes when a decision is ratified on sight.

Note that ADR-0070's Consequences still read "This ADR does not resolve that". That stays: an accepted record is a historical log and is not edited in place, so ADR-0071 is what resolves the point, and links back to it.

Related issues

None.

---

🤖 Generated with Claude Code

https://claude.ai/code/session_01JLxWJd3puHgDCdQoSiCgZC