Skip to content

Conversation

@fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #850

@roboadhoc
Copy link
Collaborator

Pull request status dashboard

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

CONFLICT (modify/delete): stock_voucher/models/stock_picking.py deleted in a840f3e45961f91a06c77aa8b6aab07e736611a4 and modified in 598dd2ae7f0d22d66d74038cf0bb5c0cfe0d9532.  Version 598dd2ae7f0d22d66d74038cf0bb5c0cfe0d9532 of stock_voucher/models/stock_picking.py 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

@fw-bot-adhoc
Copy link
Contributor Author

@mav-adhoc @jcadhoc this forward port of #850 is awaiting action (not merged or closed).

1 similar comment
@fw-bot-adhoc
Copy link
Contributor Author

@mav-adhoc @jcadhoc this forward port of #850 is awaiting action (not merged or closed).

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