Skip to content

Conversation

fw-bot
Copy link
Collaborator

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

task-n/a

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/dashboards.rst
Auto-merging content/applications/productivity/spreadsheet.rst
CONFLICT (content): Merge conflict in content/applications/productivity/spreadsheet.rst
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

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.2-18.0-spreadsheet-new-structure-mcsi-469182-fw branch from 659945a to 62327d9 Compare October 15, 2025 12:51
@C3POdoo C3POdoo requested review from a team October 15, 2025 12:54
@mcsi-odoo mcsi-odoo removed request for a team October 15, 2025 12:56
@mcsi-odoo
Copy link
Contributor

@robodoo r+

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

closes #14869

X-original-commit: c87de19
Signed-off-by: Siobhan McGonigle (mcsi) <mcsi@odoo.com>
@robodoo robodoo closed this Oct 15, 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