Merge origin/feat into feat/clause-concept-hints (heal PR-branch divergence)

Browse Source

The Gitea "Update branch" button merged main into the PR branch server-side
(8ccecc4) — auto-resolving the README conflict by dropping the ADR-0059 index
row, and predating #43. The local merge (ec7a8ff) merged current main correctly
(both 0058 + 0059 rows; includes #43). This merge absorbs the stale remote
commit without changing content — the resulting tree is identical to the
correct local tip — so a normal (non-force) push now fast-forwards origin/feat.

...

This commit is contained in:

claude@clouddev1

2026-06-23 22:13:58 +00:00

parent ec7a8ff3be 8ccecc4245

commit 5c51a00e72

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available