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
CONFLICT (modify/delete): controllers/account/go.mod deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of controllers/account/go.mod left in tree.
CONFLICT (modify/delete): controllers/account/go.sum deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of controllers/account/go.sum left in tree.
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (implicit dir rename): Existing file/dir at go.work in the way of implicit directory rename(s) putting the following path(s) there: controllers/go.work.
Auto-merging go.work
CONFLICT (implicit dir rename): Existing file/dir at go.work.sum in the way of implicit directory rename(s) putting the following path(s) there: controllers/go.work.sum.
Auto-merging go.work.sum
CONFLICT (content): Merge conflict in go.work.sum
CONFLICT (modify/delete): service/database/go.mod deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/database/go.mod left in tree.
CONFLICT (modify/delete): service/database/go.sum deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/database/go.sum left in tree.
CONFLICT (modify/delete): service/pay/go.mod deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/pay/go.mod left in tree.
CONFLICT (modify/delete): service/pay/go.sum deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/pay/go.sum left in tree.
error: could not apply e6a9868... Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)
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 #4281 into release-v4.4:
CONFLICT (modify/delete): controllers/account/go.mod deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of controllers/account/go.mod left in tree.
CONFLICT (modify/delete): controllers/account/go.sum deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of controllers/account/go.sum left in tree.
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (implicit dir rename): Existing file/dir at go.work in the way of implicit directory rename(s) putting the following path(s) there: controllers/go.work.
Auto-merging go.work
CONFLICT (implicit dir rename): Existing file/dir at go.work.sum in the way of implicit directory rename(s) putting the following path(s) there: controllers/go.work.sum.
Auto-merging go.work.sum
CONFLICT (content): Merge conflict in go.work.sum
CONFLICT (modify/delete): service/database/go.mod deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/database/go.mod left in tree.
CONFLICT (modify/delete): service/database/go.sum deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/database/go.sum left in tree.
CONFLICT (modify/delete): service/pay/go.mod deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/pay/go.mod left in tree.
CONFLICT (modify/delete): service/pay/go.sum deleted in HEAD and modified in e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)). Version e6a9868 (Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)) of service/pay/go.sum left in tree.
error: could not apply e6a9868... Bump: add sub go works to support bump kubernetes api from v0.25.6 to v0.27.4 or higher. (#4281)
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: