Closed fw-bot closed 2 months ago
@Felicious @samueljlieber cherrypicking of pull request odoo/documentation#10067 failed.
stdout:
CONFLICT (modify/delete): content/applications/inventory_and_mrp/inventory/shipping/setup/bpost.rst deleted in HEAD and modified in 52927367e ([IMP] inventory: bpost customer accounts). Version 52927367e ([IMP] inventory: bpost customer accounts) of content/applications/inventory_and_mrp/inventory/shipping/setup/bpost.rst left in tree.
stderr:
22:28:50.887003 git.c:463 trace: built-in: git cherry-pick 52927367e0ea766a6fff101cbe8def8d22499023 --strategy ort
error: could not apply 52927367e... [IMP] inventory: bpost customer accounts
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.
:warning: after resolving this conflict, you will need to merge it via @robodoo.
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
@Felicious @samueljlieber this forward port of odoo/documentation#10067 is awaiting action (not merged or closed).
@Felicious @samueljlieber this forward port of odoo/documentation#10067 is awaiting action (not merged or closed).
@Felicious @samueljlieber this forward port of odoo/documentation#10067 is awaiting action (not merged or closed).
@robodoo r+
@Felicious @samueljlieber this forward port of odoo/documentation#10067 is awaiting action (not merged or closed).
Address internal feedback from @nmarotte to specify that accounts must be business accounts to integrate the shipping connector with Odoo.
Fwport: yes (:
Task
Forward-Port-Of: odoo/documentation#10067