Skip to content

[FW][IMP] Livechat: update participate #13006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: saas-18.1
Choose a base branch
from

Conversation

fw-bot
Copy link
Collaborator

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

Update Live Chat: participate doc for 19
updating images and content to reflect style rules

Forward-Port-Of: #12983

X-original-commit: ca04891
Co-authored-by: Zaz Linkous <[email protected]>
@robodoo
Copy link
Collaborator

robodoo commented Apr 22, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 22, 2025

@jero-odoo @samueljlieber cherrypicking of pull request #12983 failed.

stdout:

Auto-merging content/applications/websites/livechat/participate.rst
CONFLICT (content): Merge conflict in content/applications/websites/livechat/participate.rst
warning: Cannot merge binary files: content/applications/websites/livechat/participate/leave-channel.png (786b97c7ddce4248fd583edd74a3f2f433fe7b81 vs. 1ebf0002fca4c0c89362737e7c82c6251a3bc79a)
Auto-merging content/applications/websites/livechat/participate/leave-channel.png
CONFLICT (content): Merge conflict in content/applications/websites/livechat/participate/leave-channel.png
warning: Cannot merge binary files: content/applications/websites/livechat/participate/managing-chat-responses.png (786b97c7ddce4248fd583edd74a3f2f433fe7b81 vs. 1ebf0002fca4c0c89362737e7c82c6251a3bc79a)
Auto-merging content/applications/websites/livechat/participate/managing-chat-responses.png
CONFLICT (content): Merge conflict in content/applications/websites/livechat/participate/managing-chat-responses.png
warning: Cannot merge binary files: content/applications/websites/livechat/participate/menu-bar.png (786b97c7ddce4248fd583edd74a3f2f433fe7b81 vs. 1ebf0002fca4c0c89362737e7c82c6251a3bc79a)
Auto-merging content/applications/websites/livechat/participate/menu-bar.png
CONFLICT (content): Merge conflict in content/applications/websites/livechat/participate/menu-bar.png
warning: Cannot merge binary files: content/applications/websites/livechat/participate/online-chat-name.png (786b97c7ddce4248fd583edd74a3f2f433fe7b81 vs. 1ebf0002fca4c0c89362737e7c82c6251a3bc79a)
Auto-merging content/applications/websites/livechat/participate/online-chat-name.png
CONFLICT (content): Merge conflict in content/applications/websites/livechat/participate/online-chat-name.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