Overview
| Comment: | A conflicting landing is resolved on its page: take a side, both, neither or an edit per conflict, then commit the merge as the author |
|---|---|
| Timelines: | family | ancestors | descendants | both | meld-resolve |
| Files: | files | file ages | folders |
| SHA3-256: |
f3a6c9403a1d4011cc4aad3acdf3d2cf |
| User & Date: | zeitgeist on 2026-10-07 20:06:22.149 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-07
| ||
| 22:39 | land meld-resolve check-in: 79d9387b8d user: dmestas tags: trunk | |
| 20:06 | A conflicting landing is resolved on its page: take a side, both, neither or an edit per conflict, then commit the merge as the author closed check-in: f3a6c9403a user: zeitgeist tags: meld-resolve | |
| 19:42 | land meld-view check-in: ee70c9c3a5 user: dmestas tags: trunk | |
Changes
Modified docs/api.md
from [6acdf7802b]
to [973892e743].
[diff]
Modified internal/api/landingconflicts.go
from [815d37098b]
to [7d0c4ffdc3].
[diff]
Added internal/api/landingresolve.go version [d377b4201a].
Added internal/api/landingresolve_test.go version [6f13509f7a].
Modified internal/api/register.go
from [caf7899738]
to [b91cb31e21].
[diff]
Modified internal/web/assets/meld.js
from [c50e9b0e77]
to [8f50cbdab2].
[diff]
Modified internal/web/meld.go
from [0be4705c2c]
to [1c5c4d357c].
[diff]
Modified internal/web/meld_test.go
from [c86ded4a94]
to [fef167cfb2].
[diff]
Modified internal/web/stylesheet.go
from [6b4629ec5e]
to [1e09bc6740].
[diff]
Modified internal/web/web.go
from [f0250e68ae]
to [d23d78c89d].
[diff]
Modified internal/zitcli/leasetoken_test.go
from [9e34778952]
to [c1cddd5028].
[diff]
Modified internal/zitcli/mergeregions.go
from [1bc66708ff]
to [7c6efa19c7].
[diff]
Modified internal/zitcli/mergeregions_test.go
from [f11d6e67e2]
to [af6827f7e7].
[diff]
Modified internal/zitcli/operand.go
from [31dfd21738]
to [5b944db582].
[diff]