C merge-tree\srecords\sa\sclean\smerge\sof\sdisjoint\schanges
D 2026-10-09T03:58:02.818
E 2026-10-09T03:58:00 2069d84acad384c43d8a67747dfc9d52122aafc1
N text/x-markdown
U dmestas
W 595
0.3.41 let `zit merge-tree --commit` record a clean merge, but only when the
two sides had changed at least one file in common. The commonest clean
merge, a branch that touched different files from trunk, was refused with
"cannot scope the working area" and nothing was written.
0.3.42 records it. A forge can now merge any clean pair from the web with
```
zit merge-tree -R REPO FEAT --into trunk --commit -m MESSAGE --user NAME \
--expect-current TRUNK_TIP --expect-other FEAT_TIP
```
and get the check-in `zit merge FEAT` and `zit commit` would make in a
checkout. Nothing else changed.
Z 1d30bb6f81f2823dd40138e8a553be1a