Lewis: May this revision serve well! lewis@tangled.org
api/tangled/cbor_gen.go
This file has not been changed.
api/tangled/feedstar.go
This file has not been changed.
api/tangled/gitrefUpdate.go
This file has not been changed.
api/tangled/repocollaborator.go
This file has not been changed.
api/tangled/repoissue.go
This file has not been changed.
api/tangled/repopull.go
This file has not been changed.
api/tangled/tangledrepo.go
This file has not been changed.
cmd/cborgen/cborgen.go
This file has not been changed.
knotserver/xrpc/merge.go
This file has not been changed.
lexicons/feed/star.json
This file has not been changed.
lexicons/git/refUpdate.json
This file has not been changed.
lexicons/issue/issue.json
This file has not been changed.
lexicons/pulls/pull.json
This file has not been changed.
lexicons/repo/collaborator.json
This file has not been changed.
lexicons/repo/repo.json
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>