Closed fw-bot closed 3 months ago
@LucasLefevre @VincentSchippefilt cherrypicking of pull request odoo/o-spreadsheet#4589 failed.
stdout:
Auto-merging src/plugins/ui_core_views/cell_evaluation/evaluator.ts
CONFLICT (content): Merge conflict in src/plugins/ui_core_views/cell_evaluation/evaluator.ts
stderr:
11:36:53.651285 git.c:463 trace: built-in: git cherry-pick 5f9ad82864d9e8bf37a19e1f7fc6d6a9379a9857 --strategy ort
error: could not apply 5f9ad8286... [PERF] evaluation: invalidate spreading in batch
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.
:warning: after resolving this conflict, you will need to merge it via @robodoo.
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
Description:
description of this task, what is implemented and why it is implemented that way.
Task: : TASK_ID
review checklist
Forward-Port-Of: odoo/o-spreadsheet#4589