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 go.mod
Auto-merging go.sum
Auto-merging go.work.sum
CONFLICT (content): Merge conflict in go.work.sum
Auto-merging test/e2e/go.mod
CONFLICT (content): Merge conflict in test/e2e/go.mod
Auto-merging test/e2e/go.sum
CONFLICT (content): Merge conflict in test/e2e/go.sum
error: could not apply f21b7c9... docs: upgrade sreg gomod (#4263)
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 #4263 into release-v4.4:
Auto-merging go.mod
Auto-merging go.sum
Auto-merging go.work.sum
CONFLICT (content): Merge conflict in go.work.sum
Auto-merging test/e2e/go.mod
CONFLICT (content): Merge conflict in test/e2e/go.mod
Auto-merging test/e2e/go.sum
CONFLICT (content): Merge conflict in test/e2e/go.sum
error: could not apply f21b7c9... docs: upgrade sreg gomod (#4263)
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: