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/api/v1/debt_webhook.go deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/account/api/v1/debt_webhook.go left in tree.
CONFLICT (modify/delete): controllers/account/go.mod deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/account/go.mod left in tree.
CONFLICT (modify/delete): controllers/account/go.sum deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/account/go.sum left in tree.
CONFLICT (modify/delete): controllers/admission/go.mod deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/admission/go.mod left in tree.
CONFLICT (modify/delete): controllers/admission/go.sum deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/admission/go.sum left in tree.
CONFLICT (modify/delete): controllers/licenseissuer/go.mod deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/licenseissuer/go.mod left in tree.
CONFLICT (modify/delete): controllers/licenseissuer/go.sum deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/licenseissuer/go.sum left in tree.
CONFLICT (modify/delete): controllers/pkg/resources/resources.go deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/pkg/resources/resources.go left in tree.
CONFLICT (modify/delete): controllers/resources/controllers/monitor_controller.go deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/resources/controllers/monitor_controller.go left in tree.
CONFLICT (modify/delete): controllers/resources/go.mod deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/resources/go.mod left in tree.
CONFLICT (modify/delete): controllers/resources/go.sum deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/resources/go.sum left in tree.
CONFLICT (modify/delete): controllers/resources/main.go deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/resources/main.go left in tree.
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.work
CONFLICT (content): Merge conflict in go.work
Auto-merging go.work.sum
CONFLICT (content): Merge conflict in go.work.sum
CONFLICT (file location): controllers/pkg/go.mod added in 0362392 (add mod file for controller pkg (#4062)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to pkg/go.mod.
CONFLICT (file location): controllers/pkg/go.sum added in 0362392 (add mod file for controller pkg (#4062)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to pkg/go.sum.
error: could not apply 0362392... add mod file for controller pkg (#4062)
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 #4062 into release-v4.4:
CONFLICT (modify/delete): controllers/account/api/v1/debt_webhook.go deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/account/api/v1/debt_webhook.go left in tree.
CONFLICT (modify/delete): controllers/account/go.mod deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/account/go.mod left in tree.
CONFLICT (modify/delete): controllers/account/go.sum deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/account/go.sum left in tree.
CONFLICT (modify/delete): controllers/admission/go.mod deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/admission/go.mod left in tree.
CONFLICT (modify/delete): controllers/admission/go.sum deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/admission/go.sum left in tree.
CONFLICT (modify/delete): controllers/licenseissuer/go.mod deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/licenseissuer/go.mod left in tree.
CONFLICT (modify/delete): controllers/licenseissuer/go.sum deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/licenseissuer/go.sum left in tree.
CONFLICT (modify/delete): controllers/pkg/resources/resources.go deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/pkg/resources/resources.go left in tree.
CONFLICT (modify/delete): controllers/resources/controllers/monitor_controller.go deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/resources/controllers/monitor_controller.go left in tree.
CONFLICT (modify/delete): controllers/resources/go.mod deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/resources/go.mod left in tree.
CONFLICT (modify/delete): controllers/resources/go.sum deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/resources/go.sum left in tree.
CONFLICT (modify/delete): controllers/resources/main.go deleted in HEAD and modified in 0362392 (add mod file for controller pkg (#4062)). Version 0362392 (add mod file for controller pkg (#4062)) of controllers/resources/main.go left in tree.
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.work
CONFLICT (content): Merge conflict in go.work
Auto-merging go.work.sum
CONFLICT (content): Merge conflict in go.work.sum
CONFLICT (file location): controllers/pkg/go.mod added in 0362392 (add mod file for controller pkg (#4062)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to pkg/go.mod.
CONFLICT (file location): controllers/pkg/go.sum added in 0362392 (add mod file for controller pkg (#4062)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to pkg/go.sum.
error: could not apply 0362392... add mod file for controller pkg (#4062)
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: