Lewis: May this revision serve well! lewis@tangled.org
appview/db/repos.go
This file has not been changed.
appview/pages/templates/repo/settings/general.html
This file has not been changed.
appview/repo/repo.go
This file has not been changed.
appview/state/state.go
This file has not been changed.
knotserver/db/db.go
This file has not been changed.
knotserver/db/didassign.go
This file has not been changed.
knotserver/db/events.go
This file has not been changed.
knotserver/db/repo_aliases.go
This file has not been changed.
knotserver/git.go
This file has not been changed.
knotserver/git_test.go
This file has not been changed.
knotserver/ingester.go
This file has not been changed.
knotserver/ingester_repo_test.go
This file has not been changed.
knotserver/internal.go
This patch was likely rebased, as context lines do not match.
knotserver/migrate.go
This file has not been changed.
knotserver/server.go
This file has not been changed.
knotserver/xrpc/create_repo.go
This file has not been changed.
knotserver/xrpc/delete_branch.go
This file has not been changed.
knotserver/xrpc/set_default_branch.go
This file has not been changed.
History
9 rounds
0 comments
1 commit
expand
collapse
Lewis: May this revision serve well! <lewis@tangled.org>
merge conflicts detected
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
1 commit
expand
collapse
Lewis: May this revision serve well! <lewis@tangled.org>
expand 0 comments
1 commit
expand
collapse
Lewis: May this revision serve well! <lewis@tangled.org>
expand 0 comments
1 commit
expand
collapse
Lewis: May this revision serve well! <lewis@tangled.org>
expand 0 comments
1 commit
expand
collapse
Lewis: May this revision serve well! <lewis@tangled.org>
expand 0 comments
1 commit
expand
collapse
Lewis: May this revision serve well! <lewis@tangled.org>
expand 0 comments
1 commit
expand
collapse
Lewis: May this revision serve well! <lewis@tangled.org>
expand 0 comments
1 commit
expand
collapse
Lewis: May this revision serve well! <lewis@tangled.org>
expand 0 comments
1 commit
expand
collapse
Lewis: May this revision serve well! <lewis@tangled.org>