Artifact [8e93bd175f]

Artifact 8e93bd175fd111e335df8e2039417038bd0bdb45400b03d79028a41b65e8e57a:

• File .fossil-settings/ignore-glob — 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: 241) [annotate] [blame] [check-ins using]

.zit.fossil
.zit-cache
.zit-cache/*
.zit-cache/checkpoint
.zit-precedent
.fslckout
_FOSSIL_-*
.zig-cache/*
zig-cache/*
zig-out/*
*.o
docs/plans/*
banks/*
commit-description-*
.agent-config/*
CLAUDE.local.md
.zit-dst-checkout-ws/*
.zit-tmp-*