[FW][FIX]replenishment/planned: fixes and improves#743
Closed
fw-bot-adhoc wants to merge 1 commit intoingadhoc:18.0from
Closed
[FW][FIX]replenishment/planned: fixes and improves#743fw-bot-adhoc wants to merge 1 commit intoingadhoc:18.0from
fw-bot-adhoc wants to merge 1 commit intoingadhoc:18.0from
Conversation
Contributor
Author
|
@jcadhoc @jjscarafia cherrypicking of pull request #730 failed. stdout: stderr: 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 |
mav-adhoc
force-pushed
the
18.0-16.0-t-89047-jc-7Zz_-fw
branch
2 times, most recently
from
cc611c1 to
fa0e673
Compare
stdout: Auto-merging product_replenishment_cost/i18n/es.po CONFLICT (content): Merge conflict in product_replenishment_cost/i18n/es.po stderr: 15:23:55.325357 git.c:444 trace: built-in: git cherry-pick 81129f9 error: could not apply 81129f9... [FIX]product_replenishment_cost:fixes and improves 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: X-original-commit: 2a7b854
mav-adhoc
force-pushed
the
18.0-16.0-t-89047-jc-7Zz_-fw
branch
from
fa0e673 to
e415c95
Compare
Contributor
|
@roboadhoc r+ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Forward-Port-Of: #731
Forward-Port-Of: #730