Skip to content

Conversation

@fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #845

@roboadhoc
Copy link
Collaborator

Pull request status dashboard

@fw-bot-adhoc
Copy link
Contributor Author

@ced-adhoc @maq-adhoc cherrypicking of pull request #845 failed.

stdout:

CONFLICT (modify/delete): stock_ux/migrations/18.0.1.5.0/pre-migration.py deleted in d047712b7f1fb7ab7505eb813ee5c7504db9b369 and modified in c649fbe5c1e5b08a59eea86551b13d48532d5f68.  Version c649fbe5c1e5b08a59eea86551b13d48532d5f68 of stock_ux/migrations/18.0.1.5.0/pre-migration.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

@ced-adhoc @maq-adhoc this forward port of #845 is awaiting action (not merged or closed).

2 similar comments
@fw-bot-adhoc
Copy link
Contributor Author

@ced-adhoc @maq-adhoc this forward port of #845 is awaiting action (not merged or closed).

@fw-bot-adhoc
Copy link
Contributor Author

@ced-adhoc @maq-adhoc this forward port of #845 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