Skip to content

Conversation

@fw-bot
Copy link
Collaborator

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

Forward-Port-Of: #4445

@robodoo
Copy link
Collaborator

robodoo commented May 25, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 25, 2023

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

stdout:

Auto-merging content/applications/finance/payment_acquirers.rst
CONFLICT (content): Merge conflict in content/applications/finance/payment_acquirers.rst
Auto-merging content/applications/finance/payment_acquirers/wire_transfer.rst
CONFLICT (content): Merge conflict in content/applications/finance/payment_acquirers/wire_transfer.rst

stderr:

17:43:32.035538 git.c:455               trace: built-in: git cherry-pick 6a9533c299223a9f8b737edbe1e3b97b3a9013be
error: could not apply 6a9533c29... [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.

@jcs-odoo jcs-odoo force-pushed the 15.0-14.0-wire-transfers-auva-AFXq-fw branch from f9dd46c to 6dda6d3 Compare May 26, 2023 08:09
@C3POdoo C3POdoo requested a review from a team May 26, 2023 08:10
@jcs-odoo jcs-odoo force-pushed the 15.0-14.0-wire-transfers-auva-AFXq-fw branch from 6dda6d3 to 4836253 Compare May 26, 2023 08:13
@AntoineVDV AntoineVDV removed the request for review from a team May 26, 2023 08:20
@auva-odoo auva-odoo force-pushed the 15.0-14.0-wire-transfers-auva-AFXq-fw branch from 4836253 to df80aaf Compare May 26, 2023 09:29
@auva-odoo auva-odoo force-pushed the 15.0-14.0-wire-transfers-auva-AFXq-fw branch from df80aaf to 6c50f09 Compare May 26, 2023 09:33
@auva-odoo auva-odoo requested a review from jcs-odoo May 26, 2023 09:38
Copy link
Contributor

@jcs-odoo jcs-odoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

robodoo pushed a commit that referenced this pull request May 26, 2023
taskid-3301001

closes #4540

Signed-off-by: Castillo Jonathan (jcs) <jcs@odoo.com>
@robodoo robodoo temporarily deployed to merge May 26, 2023 17:13 Inactive
@robodoo robodoo closed this May 26, 2023
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