Closed fw-bot closed 3 weeks ago
@LucasLefevre @laa-odoo cherrypicking of pull request odoo/o-spreadsheet#4580 failed.
stdout:
Auto-merging src/functions/helpers.ts
Auto-merging tests/functions/module_math.test.ts
CONFLICT (content): Merge conflict in tests/functions/module_math.test.ts
stderr:
15:04:43.969967 git.c:463 trace: built-in: git cherry-pick 66c5f78782d28d76ff0720d4dc4347db2b8dc92f --strategy ort
error: could not apply 66c5f7878... [FIX] functions: match empty cells
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
@LucasLefevre @laa-odoo this forward port of odoo/o-spreadsheet#4580 is awaiting action (not merged or closed).
Description:
description of this task, what is implemented and why it is implemented that way.
Task: : 4023057
review checklist
Forward-Port-Of: odoo/o-spreadsheet#4593 Forward-Port-Of: odoo/o-spreadsheet#4580