Tidy the conflict-resolution comment#40

Merged

Phlogistique merged 3 commits into

mainfrom

gloss-conflict-merge-hash

Jun 2, 2026

Commits on Jun 2, 2026

Explain the commit hash in the conflict-resolution comment

Phlogistique
and
claude
committed
Replace the dangling sub-header with a lead-in line

Phlogistique
and
claude
committed
Fast-forward locally instead of re-fetching the branch

Phlogistique
and
claude
committed