Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Dec 22, 2025

task-5108135

Forward-Port-Of: #15509

task-5108135 X-original-commit: dcdf15f
@robodoo
Copy link
Collaborator

robodoo commented Dec 22, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 22, 2025

@auva-odoo cherrypicking of pull request #15509 failed.

stdout:

Auto-merging content/applications/general/iot/devices.rst CONFLICT (content): Merge conflict in content/applications/general/iot/devices.rst Auto-merging content/applications/general/iot/windows_iot.rst CONFLICT (content): Merge conflict in content/applications/general/iot/windows_iot.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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

3 participants