Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented May 26, 2023

Forward-Port-Of: #4540
Forward-Port-Of: #4445

@robodoo
Copy link
Collaborator

robodoo commented May 26, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 26, 2023

@auva-odoo @jcs-odoo cherrypicking of pull request #4445 failed.

stdout:

CONFLICT (modify/delete): content/applications/finance/payment_acquirers.rst deleted in HEAD and modified in 6c50f0972 ([IMP] payment providers: Wire Transfer).  Version 6c50f0972 ([IMP] payment providers: Wire Transfer) of content/applications/finance/payment_acquirers.rst left in tree.
Auto-merging content/applications/finance/payment_providers/wire_transfer.rst
CONFLICT (content): Merge conflict in content/applications/finance/payment_providers/wire_transfer.rst
CONFLICT (rename/delete): content/applications/finance/payment_acquirers/wire_transfer/payment_check.png renamed to content/applications/finance/payment_providers/wire_transfer/payment_check.png in HEAD, but deleted in 6c50f0972 ([IMP] payment providers: Wire Transfer).
CONFLICT (rename/delete): content/applications/finance/payment_acquirers/wire_transfer/payment_customer_instructions.png renamed to content/applications/finance/payment_providers/wire_transfer/payment_customer_instructions.png in HEAD, but deleted in 6c50f0972 ([IMP] payment providers: Wire Transfer).
CONFLICT (file location): content/applications/finance/payment_acquirers/wire_transfer/payment_instructions_checkout.png added in 6c50f0972 ([IMP] payment providers: Wire Transfer) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/finance/payment_providers/wire_transfer/payment_instructions_checkout.png.
CONFLICT (file location): content/applications/finance/payment_acquirers/wire_transfer/payment_instructions_portal.png added in 6c50f0972 ([IMP] payment providers: Wire Transfer) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/finance/payment_providers/wire_transfer/payment_instructions_portal.png.

stderr:

19:17:05.415838 git.c:455               trace: built-in: git cherry-pick 6c50f0972be3a2421c4c8bacf636a954025cff84
error: could not apply 6c50f0972... [IMP] payment providers: Wire Transfer
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", 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".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

@auva-odoo auva-odoo force-pushed the 16.0-14.0-wire-transfers-auva-QlG3-fw branch from da3205b to 3350efc Compare May 30, 2023 09:59
@C3POdoo C3POdoo requested a review from a team May 30, 2023 10:02
@auva-odoo auva-odoo force-pushed the 16.0-14.0-wire-transfers-auva-QlG3-fw branch from 3350efc to b477cb2 Compare May 30, 2023 10:54
@auva-odoo
Copy link
Contributor

@robodoo r+

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants