Lewis: May this revision serve well! lewis@tangled.org
appview/compat113/compat.go
appview/compat113/compat.go
This file has not been changed.
appview/compat113/compat_test.go
appview/compat113/compat_test.go
This file has not been changed.
appview/compat113/version.go
appview/compat113/version.go
This file has not been changed.
appview/compat113/version_test.go
appview/compat113/version_test.go
This file has not been changed.
appview/ingester_repo.go
appview/ingester_repo.go
This file has not been changed.
appview/pulls/create.go
appview/pulls/create.go
This patch was likely rebased, as context lines do not match.
appview/pulls/resubmit.go
appview/pulls/resubmit.go
This file has not been changed.
appview/repo/repo.go
appview/repo/repo.go
This file has not been changed.
appview/repoverify/verify.go
appview/repoverify/verify.go
This file has not been changed.
knotmirror/knotstream/slurper.go
knotmirror/knotstream/slurper.go
This file has not been changed.
History
2 rounds
0 comments
oyster.cafe
submitted
#1
1 commit
expand
collapse
appview,knotmirror: tolerate 1.13 knots during 1.14 rollout
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
#0
1 commit
expand
collapse
appview,knotmirror: tolerate 1.13 knots during 1.14 rollout
Lewis: May this revision serve well! <lewis@tangled.org>