Skip to content

Conversation

fw-bot
Copy link
Collaborator

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

task-4850059

Forward-Port-Of: #14278

@robodoo
Copy link
Collaborator

robodoo commented Aug 22, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Aug 22, 2025

@masp-odoo @auva-odoo cherrypicking of pull request #14278 failed.

stdout:

CONFLICT (modify/delete): content/applications/sales/members.rst deleted in e5d8aaa2e209d5e8647eb120bb18553fb8a0556d and modified in 706d49675f7cfe95e06aa21f9d7eb904ab3bbe51.  Version 706d49675f7cfe95e06aa21f9d7eb904ab3bbe51 of content/applications/sales/members.rst left in tree.

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

@masp-odoo masp-odoo force-pushed the saas-18.3-18.0-website-structure-masp-458159-fw branch from 67a9c32 to eee3bc3 Compare August 26, 2025 11:47
@C3POdoo C3POdoo requested review from a team August 26, 2025 12:01
@masp-odoo masp-odoo requested review from auva-odoo and removed request for a team August 26, 2025 12:06
Copy link
Contributor

@auva-odoo auva-odoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

robodoo pushed a commit that referenced this pull request Aug 26, 2025
task-4850059

closes #14390

Signed-off-by: Audrey Vandromme (auva) <auva@odoo.com>
@robodoo robodoo closed this Aug 26, 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