Skip to content

Conversation

@fw-bot-adhoc
Copy link

Forward-Port-Of: #771

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Author

@mav-adhoc @jcadhoc cherrypicking of pull request #771 failed.

stdout:

Auto-merging product_currency_mrp/report/mrp_report_bom_structure.py
CONFLICT (content): Merge conflict in product_currency_mrp/report/mrp_report_bom_structure.py
Auto-merging product_currency_mrp/__manifest__.py
CONFLICT (content): Merge conflict in product_currency_mrp/__manifest__.py

stderr:

16:10:22.058657 git.c:444               trace: built-in: git cherry-pick 309da6a2ddcc0cd9200a9568677dc14fea226b94
error: could not apply 309da6a2... [FIX]product_currency_mrp: parent_product in get_bom_data
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
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.

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