Overview
| Comment: | land merge-everywhere |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
52a11f671ac609320c7b0142f75697a3 |
| User & Date: | dmestas on 2026-10-08 11:18:23.498 |
| Other Links: | manifest | tags |
Context
|
2026-10-08
| ||
| 13:14 | land phone-edges check-in: ae73c9e492 user: dmestas tags: trunk | |
| 11:48 | Phone merge blocks: highlights run the full scrolled width, and each block says where its context stops closed check-in: 73dd68ab1e user: zeitgeist tags: phone-edges | |
| 11:18 | land merge-everywhere check-in: 52a11f671a user: dmestas tags: trunk | |
| 10:42 | The merge view reaches every place two branches meet: a merge page for any pair, the branches list, the branch diff and stacked rungs closed check-in: f06409cb15 user: zeitgeist tags: merge-everywhere | |
| 00:33 | land phone-meld-width check-in: b6c7897a2d user: dmestas tags: trunk | |
Changes
Modified cmd/quarry/main.go
from [93dc3750c2]
to [9886107084].
[diff]
Modified docs/api.md
from [973892e743]
to [123e0e0675].
[diff]
Modified internal/api/landingconflicts.go
from [7d0c4ffdc3]
to [b8114eb7ac].
[diff]
Modified internal/api/landingresolve.go
from [d377b4201a]
to [4c326fb2a7].
[diff]
Modified internal/api/landingresolve_test.go
from [6f13509f7a]
to [f7fed717f0].
[diff]
Added internal/api/mergepair.go version [3966e49480].
Modified internal/api/register.go
from [b91cb31e21]
to [cfd110eb76].
[diff]
Added internal/web/mergepage.go version [7ae731e599].
Added internal/web/mergepage_test.go version [c7e3da1468].
Modified internal/web/stylesheet.go
from [2646dbb62e]
to [3ed05cdbd2].
[diff]
Modified internal/web/web.go
from [d23d78c89d]
to [ee9e6ccbec].
[diff]
Modified internal/zitcli/leasetoken_test.go
from [c1cddd5028]
to [68a21bc322].
[diff]
Modified internal/zitcli/zitcli.go
from [059a1972fe]
to [c168b3805e].
[diff]