Overview
| Comment: | fix(release): export tag-only mirror changes |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
91cc1528fce4f5d4c2a1991a9245c50c |
| User & Date: | dmestas on 2026-08-18 19:39:05.763 |
| Other Links: | manifest | tags |
Context
|
2026-08-18
| ||
| 20:37 |
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. check-in: a9a24a857c user: dmestas tags: trunk | |
| 19:39 | fix(release): export tag-only mirror changes check-in: 91cc1528fc user: dmestas tags: trunk | |
| 19:22 | release: prepare zit 0.1.4 check-in: 4c2286bcb4 user: dmestas tags: trunk, version-0.1.4 | |
Changes
Modified scripts/mirror-export.sh
from [a2d09af428]
to [2b9b50ee27].
[diff]