Closed fw-bot closed 2 months ago
@laa-odoo @LucasLefevre cherrypicking of pull request odoo/o-spreadsheet#4782 failed.
stdout:
Auto-merging src/clipboard_handlers/cell_clipboard.ts
CONFLICT (content): Merge conflict in src/clipboard_handlers/cell_clipboard.ts
Auto-merging src/plugins/core/cell.ts
Auto-merging src/plugins/core/sheet.ts
Auto-merging src/plugins/ui_feature/data_cleanup.ts
Auto-merging src/plugins/ui_stateful/clipboard.ts
CONFLICT (content): Merge conflict in src/plugins/ui_stateful/clipboard.ts
Auto-merging src/types/commands.ts
Auto-merging tests/test_helpers/commands_helpers.ts
Auto-merging tests/test_helpers/constants.ts
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
@robodoo r+
for performance and clarification reasons, groups the dispatch commands "CLEAR_CELL" with a single command "CLEAR_CELLS" where possible.
Task : 4095732
review checklist
Forward-Port-Of: odoo/o-spreadsheet#4831 Forward-Port-Of: odoo/o-spreadsheet#4782