Skip to content

Conversation

@fw-bot
Copy link
Collaborator

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

task-4969391

Forward-Port-Of: #14738
Forward-Port-Of: #14506

@robodoo
Copy link
Collaborator

robodoo commented Oct 1, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 1, 2025

@mcsi-odoo @xpl-odoo cherrypicking of pull request #14506 failed.

stdout:

Auto-merging content/applications/productivity/spreadsheet/global_filters.rst
CONFLICT (content): Merge conflict in content/applications/productivity/spreadsheet/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.3-18.0-dashboards-intro-consult-manage-mcsi-466794-fw branch from 410844b to dc6be37 Compare October 1, 2025 09:26
@C3POdoo C3POdoo requested review from a team October 1, 2025 09:30
@mcsi-odoo
Copy link
Contributor

@robodoo r+

@mcsi-odoo mcsi-odoo removed request for a team October 1, 2025 10:00
robodoo pushed a commit that referenced this pull request Oct 1, 2025
task-4969391

closes #14748

X-original-commit: 57a6f8b
Signed-off-by: Xavier Platteau (xpl) <[email protected]>
Signed-off-by: Siobhan McGonigle (mcsi) <[email protected]>
@robodoo robodoo closed this Oct 1, 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.

4 participants