Skip to content

Conversation

fw-bot
Copy link
Collaborator

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

task-n/a

Forward-Port-Of: #14870
Forward-Port-Of: #14825

@robodoo
Copy link
Collaborator

robodoo commented Oct 17, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 17, 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-boolean.png added in 266b0da42dd3eea1ab61c2531fe2e47e99569b08 inside a directory that was renamed in 123e69b6ce17d56bd1a87ed687c21f116afebc06, suggesting it should perhaps be moved to content/applications/productivity/spreadsheet/work_with_data/global_filters/example-boolean.png.
CONFLICT (rename/delete): content/applications/productivity/spreadsheet/global_filters/example-checkbox.png renamed to content/applications/productivity/spreadsheet/work_with_data/global_filters/example-checkbox.png in 123e69b6ce17d56bd1a87ed687c21f116afebc06, but deleted in 266b0da42dd3eea1ab61c2531fe2e47e99569b08.
CONFLICT (file location): content/applications/productivity/spreadsheet/global_filters/field-matching-boolean.png added in 266b0da42dd3eea1ab61c2531fe2e47e99569b08 inside a directory that was renamed in 123e69b6ce17d56bd1a87ed687c21f116afebc06, suggesting it should perhaps be moved to content/applications/productivity/spreadsheet/work_with_data/global_filters/field-matching-boolean.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

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