Skip to content

Conversation

@fw-bot
Copy link
Collaborator

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

Task ID: 3300955

Forward-Port-Of: #4344

@robodoo
Copy link
Collaborator

robodoo commented May 8, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 8, 2023

@xpl-odoo cherrypicking of pull request #4344 failed.

stdout:

CONFLICT (modify/delete): content/applications/productivity/studio/concepts/understanding_automated_actions.rst deleted in HEAD and modified in e75d09e85 ([IMP] upgrade: clarify and update the SLA section).  Version e75d09e85 ([IMP] upgrade: clarify and update the SLA section) of content/applications/productivity/studio/concepts/understanding_automated_actions.rst left in tree.

stderr:

12:32:48.681123 git.c:455               trace: built-in: git cherry-pick e75d09e855c304e03d4e366d1560c40559951f47
error: could not apply e75d09e85... [IMP] upgrade: clarify and update the SLA section
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.

@xpl-odoo xpl-odoo force-pushed the 15.0-14.0-upgrade-sla-xpl-sPv5-fw branch from 6c6d9aa to 96d88bd Compare May 8, 2023 11:22
@C3POdoo C3POdoo requested a review from a team May 8, 2023 11:24
@xpl-odoo xpl-odoo removed the request for review from a team May 8, 2023 11:25
@xpl-odoo xpl-odoo force-pushed the 15.0-14.0-upgrade-sla-xpl-sPv5-fw branch from 96d88bd to 5784d4a Compare May 8, 2023 11:26
@xpl-odoo
Copy link
Contributor

xpl-odoo commented May 8, 2023

@robodoo r+

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