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][I18N] export source terms #159828

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 29, 2024

@robodoo
Copy link
Contributor

robodoo commented Mar 29, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 29, 2024

@oomsveta cherrypicking of pull request #159529 failed.

stdout:

Auto-merging addons/mail/i18n/mail.pot
CONFLICT (modify/delete): addons/pos_sale_product_configurator/i18n/pos_sale_product_configurator.pot deleted in HEAD and modified in c8cb5930c2ba ([I18N] export source terms).  Version c8cb5930c2ba ([I18N] export source terms) of addons/pos_sale_product_configurator/i18n/pos_sale_product_configurator.pot left in tree.
CONFLICT (modify/delete): addons/sale_product_configurator/i18n/sale_product_configurator.pot deleted in HEAD and modified in c8cb5930c2ba ([I18N] export source terms).  Version c8cb5930c2ba ([I18N] export source terms) of addons/sale_product_configurator/i18n/sale_product_configurator.pot left in tree.
CONFLICT (modify/delete): addons/website_sale_product_configurator/i18n/website_sale_product_configurator.pot deleted in HEAD and modified in c8cb5930c2ba ([I18N] export source terms).  Version c8cb5930c2ba ([I18N] export source terms) of addons/website_sale_product_configurator/i18n/website_sale_product_configurator.pot left in tree.

stderr:

02:29:04.032238 git.c:463               trace: built-in: git cherry-pick c8cb5930c2baf2f453572276bf7a78f217962092
error: could not apply c8cb5930c2ba... [I18N] export source terms
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 29, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 29, 2024
@oomsveta oomsveta closed this Mar 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants