odoo / o-spreadsheet

Other
193 stars 44 forks source link

[FW][FIX] functions: allow to match empty cells #4593

Closed fw-bot closed 3 months ago

fw-bot commented 3 months ago

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#4591 Forward-Port-Of: odoo/o-spreadsheet#4580

robodoo commented 3 months ago

Pull request status dashboard

fw-bot commented 3 months ago

@LucasLefevre @laa-odoo cherrypicking of pull request odoo/o-spreadsheet#4580 failed.

stdout:

Auto-merging src/functions/helpers.ts
CONFLICT (content): Merge conflict in src/functions/helpers.ts
Auto-merging tests/functions/module_math.test.ts

stderr:

14:21:51.412472 git.c:463               trace: built-in: git cherry-pick 61daa36554aa0f3ac3bc9063bf80903fb323803b --strategy ort
error: could not apply 61daa3655... [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