Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 21, 2023

task-3284514

I forgot to move this in #4226

@fw-bot up to 14.0

Forward-Port-Of: #4236

@robodoo
Copy link
Collaborator

robodoo commented Apr 21, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 21, 2023

@jcs-odoo cherrypicking of pull request #4236 failed.

stdout:

Auto-merging content/applications/sales/point_of_sale.rst
CONFLICT (content): Merge conflict in content/applications/sales/point_of_sale.rst
CONFLICT (file location): content/applications/sales/point_of_sale/pricing/fiscal_position.rst added in e35fb8176 ([MOV] pos: fiscal_position to "pricing" section) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/sales/point_of_sale/advanced_pricing_features/fiscal_position.rst.
CONFLICT (file location): content/applications/sales/point_of_sale/pricing/fiscal_position/fiscal_position_01.png added in e35fb8176 ([MOV] pos: fiscal_position to "pricing" section) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/sales/point_of_sale/advanced_pricing_features/fiscal_position/fiscal_position_01.png.
CONFLICT (file location): content/applications/sales/point_of_sale/pricing/fiscal_position/fiscal_position_02.png added in e35fb8176 ([MOV] pos: fiscal_position to "pricing" section) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/sales/point_of_sale/advanced_pricing_features/fiscal_position/fiscal_position_02.png.
CONFLICT (file location): content/applications/sales/point_of_sale/pricing/fiscal_position/fiscal_position_03.png added in e35fb8176 ([MOV] pos: fiscal_position to "pricing" section) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to content/applications/sales/point_of_sale/advanced_pricing_features/fiscal_position/fiscal_position_03.png.
CONFLICT (modify/delete): content/applications/sales/point_of_sale/pricing.rst deleted in HEAD and modified in e35fb8176 ([MOV] pos: fiscal_position to "pricing" section).  Version e35fb8176 ([MOV] pos: fiscal_position to "pricing" section) of content/applications/sales/point_of_sale/pricing.rst left in tree.
Auto-merging content/applications/sales/point_of_sale/shop.rst
Auto-merging redirects/14.0.txt
CONFLICT (content): Merge conflict in redirects/14.0.txt

stderr:

23:49:51.745220 git.c:455               trace: built-in: git cherry-pick e35fb81761fcff3e3f711ef959a96bbb2ed2e883
error: could not apply e35fb8176... [MOV] pos: fiscal_position to "pricing" section
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
Copy link
Contributor

shouldn't have been forward-ported 🤨

@jcs-odoo jcs-odoo closed this Apr 22, 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