Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 15, 2025

task-n/a

Forward-Port-Of: #14869
Forward-Port-Of: #14825

@robodoo
Copy link
Collaborator

robodoo commented Oct 15, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 15, 2025

@mcsi-odoo cherrypicking of pull request #14825 failed.

stdout:

Auto-merging content/applications/productivity/spreadsheet/insert.rst
CONFLICT (content): Merge conflict in content/applications/productivity/spreadsheet/insert.rst
Auto-merging content/applications/productivity/spreadsheet/work_with_data/global_filters.rst
CONFLICT (file location): content/applications/productivity/spreadsheet/global_filters/example-checkbox.png added in c366f9a46e4dac1de6bc24907e420ded14eeaec7 inside a directory that was renamed in 62327d94a004410b39c051c5f4f31d2ef2d6ab30, suggesting it should perhaps be moved to content/applications/productivity/spreadsheet/work_with_data/global_filters/example-checkbox.png.
CONFLICT (file location): content/applications/productivity/spreadsheet/global_filters/field-matching-checkbox.png added in c366f9a46e4dac1de6bc24907e420ded14eeaec7 inside a directory that was renamed in 62327d94a004410b39c051c5f4f31d2ef2d6ab30, suggesting it should perhaps be moved to content/applications/productivity/spreadsheet/work_with_data/global_filters/field-matching-checkbox.png.

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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@mcsi-odoo mcsi-odoo force-pushed the saas-18.3-18.0-spreadsheet-new-structure-mcsi-470468-fw branch from e66fc05 to 123e69b Compare October 16, 2025 14:28
@C3POdoo C3POdoo requested review from a team October 16, 2025 14:44
@mcsi-odoo mcsi-odoo removed request for a team October 16, 2025 14:59
@mcsi-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Oct 17, 2025
task-n/a

closes #14870

X-original-commit: 03ff300
Signed-off-by: Siobhan McGonigle (mcsi) <mcsi@odoo.com>
@robodoo robodoo closed this Oct 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants