Artifact b5b17b25eda5ca089224015223dd72c2f4029c127b031c44ef072af6c5172993:
- File
www/reference.html
— part of check-in
[a9a24a857c]
at
2026-08-18 20:37:02
on branch trunk
— precedent: remember conflict resolutions and replay them
A merge records each conflict in the local .zit-precedent sidecar; commit attaches the resolution the operator settled on; a later merge whose conflicted bytes match replays it instead of writing markers. Keyed by path and conflicted bytes, exact because the diff3 envelope carries all three sides. Whole-file, so a file whose other conflict moved will not replay.
Replay is named per file, never silent. --no-precedent declines for one merge without forgetting. 'zit precedent list|show|forget', alias rerere. The sidecar is a reserved advisory name, so it can never become an artifact. (user: dmestas, size: 96929) [annotate] [blame] [check-ins using]