Closed fw-bot closed 1 week ago
@pro-odoo @LucasLefevre cherrypicking of pull request odoo/o-spreadsheet#4528 failed.
stdout:
Auto-merging src/helpers/pivot/pivot_helpers.ts
Auto-merging src/helpers/pivot/spreadsheet_pivot/date_spreadsheet_pivot.ts
CONFLICT (content): Merge conflict in src/helpers/pivot/spreadsheet_pivot/date_spreadsheet_pivot.ts
Auto-merging src/types/pivot.ts
Auto-merging tests/pivots/spreadsheet_pivot/date_spreadsheet_pivot.test.ts
Auto-merging tests/pivots/spreadsheet_pivot/spreadsheet_pivot.test.ts
stderr:
14:55:26.122307 git.c:463 trace: built-in: git cherry-pick 090306fb920c11cd8aafa2ba77fda172bfe27da9 --strategy ort
error: could not apply 090306fb9... [REM] pivot: remove granularity year_number
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
@pro-odoo @LucasLefevre this forward port of odoo/o-spreadsheet#4528 is awaiting action (not merged or closed).
This commit removes the granularity year_number from the pivot. One can use the granularity year instead, it's more concise and will be consistent with Odoo.
Part of task: 3899604
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#4528