Lewis: May this revision serve well! lewis@tangled.org
appview/db/db.go
appview/db/db.go
This file has not been changed.
appview/pages/templates/repo/needsUpgrade.html
appview/pages/templates/repo/needsUpgrade.html
This file has not been changed.
appview/pages/templates/repo/settings/general.html
appview/pages/templates/repo/settings/general.html
This file has not been changed.
docs/DOCS.md
docs/DOCS.md
This file has not been changed.
knotserver/xrpc/version.go
knotserver/xrpc/version.go
This file has not been changed.
nix/pkgs/knot-unwrapped.nix
nix/pkgs/knot-unwrapped.nix
This file has not been changed.
History
3 rounds
0 comments
oyster.cafe
submitted
#2
1 commit
expand
collapse
appview,knotserver: 1.14 deploy prep
Lewis: May this revision serve well! <lewis@tangled.org>
merge conflicts detected
expand
collapse
expand
collapse
- api/tangled/cbor_gen.go:866
- api/tangled/feedstar.go:5
- api/tangled/gitrefUpdate.go:29
- api/tangled/repocollaborator.go:19
- api/tangled/repoissue.go:22
- api/tangled/repopull.go:39
- api/tangled/tangledrepo.go:24
- cmd/cborgen/cborgen.go:17
- knotserver/xrpc/merge.go:118
- lexicons/feed/star.json:10
- lexicons/git/refUpdate.json:11
- lexicons/issue/issue.json:9
- lexicons/pulls/pull.json:65
- lexicons/repo/collaborator.json:11
- lexicons/repo/repo.json:6
expand 0 comments
oyster.cafe
submitted
#1
1 commit
expand
collapse
appview,knotserver: 1.14 deploy prep
Lewis: May this revision serve well! <lewis@tangled.org>
expand 0 comments
oyster.cafe
submitted
#0
1 commit
expand
collapse
appview,knotserver: 1.14 deploy prep
Lewis: May this revision serve well! <lewis@tangled.org>