Skip to content

[IMP] website: update header/footer page#18919

Closed
fw-bot wants to merge 1 commit into
saas-19.1from
saas-19.1-19.0-website-header-footer-lman-538907-fw
Closed

[IMP] website: update header/footer page#18919
fw-bot wants to merge 1 commit into
saas-19.1from
saas-19.1-19.0-website-header-footer-lman-538907-fw

Conversation

@fw-bot

@fw-bot fw-bot commented Jul 14, 2026

Copy link
Copy Markdown
Collaborator

task-6260356

Forward-Port-Of: #18591

@robodoo

robodoo commented Jul 14, 2026

Copy link
Copy Markdown
Collaborator

Pull request status dashboard

@fw-bot

fw-bot commented Jul 14, 2026

Copy link
Copy Markdown
Collaborator Author

@lman-odoo cherrypicking of pull request #18591 failed.

stdout:

Auto-merging content/applications/websites/ecommerce/ecommerce_design/catalog.rst
CONFLICT (modify/delete): content/applications/websites/website/website_creation.rst deleted in 9cc54f304303c5bcc1557be19869301f8f79a236 and modified in efabbcc40e50505829b280c13109f03ad5ac9fc4.  Version efabbcc40e50505829b280c13109f03ad5ac9fc4 of content/applications/websites/website/website_creation.rst left in tree.

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

:shipit: you can use git-fw to re-do the forward-port for you locally.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@lman-odoo
lman-odoo force-pushed the saas-19.1-19.0-website-header-footer-lman-538907-fw branch from 3008abf to a47ece2 Compare July 15, 2026 05:07
@C3POdoo
C3POdoo requested review from a team July 15, 2026 05:09
@lman-odoo
lman-odoo removed request for a team July 15, 2026 05:19
@lman-odoo
lman-odoo force-pushed the saas-19.1-19.0-website-header-footer-lman-538907-fw branch from a47ece2 to 41e987d Compare July 16, 2026 07:50
@lman-odoo

Copy link
Copy Markdown
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Jul 16, 2026
task-6260356

closes #18919

Signed-off-by: Larissa Manderfeld (lman) <lman@odoo.com>
robodoo pushed a commit that referenced this pull request Jul 16, 2026
task-6260356

closes #18919

Signed-off-by: Larissa Manderfeld (lman) <lman@odoo.com>
robodoo pushed a commit that referenced this pull request Jul 16, 2026
task-6260356

closes #18919

Signed-off-by: Larissa Manderfeld (lman) <lman@odoo.com>
robodoo pushed a commit that referenced this pull request Jul 16, 2026
task-6260356

closes #18919

Signed-off-by: Larissa Manderfeld (lman) <lman@odoo.com>
@robodoo robodoo closed this Jul 16, 2026
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