You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Auto-merging pkg/filesystem/registry/sync.go
CONFLICT (content): Merge conflict in pkg/filesystem/registry/sync.go
error: could not apply c8f7a9c... fix: sync registry contents via ssh (#4106) (#4109)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
The text was updated successfully, but these errors were encountered:
Error cherry-picking PR #4109 into release-v4.3:
Auto-merging pkg/filesystem/registry/sync.go
CONFLICT (content): Merge conflict in pkg/filesystem/registry/sync.go
error: could not apply c8f7a9c... fix: sync registry contents via ssh (#4106) (#4109)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
The text was updated successfully, but these errors were encountered: