Overview
| Comment: | Merge a branch or a check-in onto its target from the merge page, gated as a push |
|---|---|
| Timelines: | family | ancestors | descendants | both | web-merge |
| Files: | files | file ages | folders |
| SHA3-256: |
6566c6cb648e3a0cfec222cb9d6234c9 |
| User & Date: | zeitgeist on 2026-10-08 21:25:06.165 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-08
| ||
| 21:28 | land web-merge check-in: f9ea8778c6 user: dmestas tags: trunk | |
| 21:25 | Merge a branch or a check-in onto its target from the merge page, gated as a push closed check-in: 6566c6cb64 user: zeitgeist tags: web-merge | |
| 21:18 | land people-invite-withdraw check-in: 7999d7bd16 user: dmestas tags: trunk | |
Changes
Modified docs/api.md
from [3b7bc02e70]
to [df0d3e9e7a].
[diff]
Modified internal/api/landingconflicts.go
from [b8114eb7ac]
to [388ae009bd].
[diff]
Modified internal/api/landingresolve.go
from [4c326fb2a7]
to [f1803eca7c].
[diff]
Modified internal/api/landingresolve_test.go
from [f7fed717f0]
to [aad1287438].
[diff]
Modified internal/api/mergepair.go
from [3966e49480]
to [255371274e].
[diff]
Modified internal/web/meld.go
from [08d0db5f9a]
to [7a20826897].
[diff]
Modified internal/web/mergepage.go
from [7ae731e599]
to [a8a109b615].
[diff]
Modified internal/web/mergepage_test.go
from [c7e3da1468]
to [593b6acfb5].
[diff]
Modified internal/web/stylesheet.go
from [1305321046]
to [b125a00992].
[diff]
Modified internal/web/web.go
from [90a19f9308]
to [ae60bea94f].
[diff]
Modified internal/zitcli/mergeregions_test.go
from [af6827f7e7]
to [600b2d015e].
[diff]