Skip to content

Conversation

@fw-bot-adhoc
Copy link

Forward-Port-Of: #438

@roboadhoc
Copy link

Pull request status dashboard

@fw-bot-adhoc
Copy link
Author

@JrAdhoc @cem-adhoc cherrypicking of pull request #438 failed.

stdout:

CONFLICT (modify/delete): website_sale_stock_ux/__manifest__.py deleted in 34e8a2bb381834ffacc21da3e1057b622fb6bc45 and modified in 11439bb5ed716b9205f484b7a4c9d100780b5604.  Version 11439bb5ed716b9205f484b7a4c9d100780b5604 of website_sale_stock_ux/__manifest__.py left in tree.
CONFLICT (modify/delete): website_sale_stock_ux/views/templates.xml deleted in 34e8a2bb381834ffacc21da3e1057b622fb6bc45 and modified in 11439bb5ed716b9205f484b7a4c9d100780b5604.  Version 11439bb5ed716b9205f484b7a4c9d100780b5604 of website_sale_stock_ux/views/templates.xml left in tree.

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.

⚠️ after resolving this conflict, you will need to merge it via @roboadhoc.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

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