Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][IMP]stock_ux: replenish location checkbox warning #614

Open
wants to merge 1 commit into
base: 18.0
Choose a base branch
from

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #611

@roboadhoc
Copy link
Collaborator

@fw-bot-adhoc
Copy link
Contributor Author

@mav-adhoc @ced-adhoc cherrypicking of pull request #611 failed.

stdout:

Auto-merging stock_ux/models/__init__.py
CONFLICT (content): Merge conflict in stock_ux/models/__init__.py

stderr:

15:42:57.381532 git.c:444               trace: built-in: git cherry-pick 05c67938f4761fca271e94371bad59a5ab6d3aef
error: could not apply 05c67938... [IMP]stock_ux: replenish location checkbox warning
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