Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented May 30, 2023

Forward-Port-Of: #4566

@robodoo
Copy link
Collaborator

robodoo commented May 30, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 30, 2023

@mart-e cherrypicking of pull request #4566 failed.

stdout:

Auto-merging locale/sources/contributing.pot
CONFLICT (content): Merge conflict in locale/sources/contributing.pot
Auto-merging locale/sources/finance.pot
CONFLICT (content): Merge conflict in locale/sources/finance.pot
Auto-merging locale/sources/general.pot
CONFLICT (content): Merge conflict in locale/sources/general.pot
Auto-merging locale/sources/inventory_and_mrp.pot
CONFLICT (content): Merge conflict in locale/sources/inventory_and_mrp.pot
CONFLICT (modify/delete): locale/sources/legal.pot deleted in 754b1445f ([I18N] *: export 16.0 source terms) and modified in HEAD.  Version HEAD of locale/sources/legal.pot left in tree.
Auto-merging locale/sources/productivity.pot
CONFLICT (content): Merge conflict in locale/sources/productivity.pot
Auto-merging locale/sources/sales.pot
CONFLICT (content): Merge conflict in locale/sources/sales.pot

stderr:

18:32:04.859425 git.c:455               trace: built-in: git cherry-pick 754b1445fc44c13386d07143c433757cde060394
error: could not apply 754b1445f... [I18N] *: export 16.0 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.

@mart-e mart-e force-pushed the saas-16.1-16.0-i18n-export-mat-afQ2-fw branch from e0520b3 to 7575696 Compare June 3, 2023 07:04
@mart-e
Copy link
Contributor

mart-e commented Jun 3, 2023

robodoo r+

robodoo pushed a commit that referenced this pull request Jun 3, 2023
closes #4568

X-original-commit: c4bc3b5
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
@robodoo robodoo temporarily deployed to merge June 3, 2023 08:08 Inactive
@robodoo robodoo closed this Jun 3, 2023
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