Skip to content
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

[FW][IMP] essentials: iap graphics update and rewrite #8921

Closed
wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator

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

Take the rewrite that was pushed in #7427 and cherry-picking to Odoo 15/16 documentation.

Task:
https://www.odoo.com/web?debug=1#id=2753507&cids=3&menu_id=4720&action=333&active_id=3835&model=project.task&view_type=form

Forward-Port-Of: #8917
Forward-Port-Of: #8812

@robodoo
Copy link
Collaborator

robodoo commented Apr 22, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 22, 2024

@tiku-odoo cherrypicking of pull request #8812 failed.

stdout:

Auto-merging content/applications/essentials/in_app_purchase.rst
CONFLICT (content): Merge conflict in content/applications/essentials/in_app_purchase.rst
warning: Cannot merge binary files: content/applications/essentials/in_app_purchase/buy-pack.png (HEAD vs. 41be38220 ([IMP] essentials: iap rewrite))
Auto-merging content/applications/essentials/in_app_purchase/buy-pack.png
CONFLICT (add/add): Merge conflict in content/applications/essentials/in_app_purchase/buy-pack.png
warning: Cannot merge binary files: content/applications/essentials/in_app_purchase/iap.png (HEAD vs. 41be38220 ([IMP] essentials: iap rewrite))
Auto-merging content/applications/essentials/in_app_purchase/iap.png
CONFLICT (add/add): Merge conflict in content/applications/essentials/in_app_purchase/iap.png
warning: Cannot merge binary files: content/applications/essentials/in_app_purchase/packs.png (HEAD vs. 41be38220 ([IMP] essentials: iap rewrite))
Auto-merging content/applications/essentials/in_app_purchase/packs.png
CONFLICT (add/add): Merge conflict in content/applications/essentials/in_app_purchase/packs.png
warning: Cannot merge binary files: content/applications/essentials/in_app_purchase/sms-icon.png (HEAD vs. 41be38220 ([IMP] essentials: iap rewrite))
Auto-merging content/applications/essentials/in_app_purchase/sms-icon.png
CONFLICT (add/add): Merge conflict in content/applications/essentials/in_app_purchase/sms-icon.png
warning: Cannot merge binary files: content/applications/essentials/in_app_purchase/view-services.png (HEAD vs. 41be38220 ([IMP] essentials: iap rewrite))
Auto-merging content/applications/essentials/in_app_purchase/view-services.png
CONFLICT (add/add): Merge conflict in content/applications/essentials/in_app_purchase/view-services.png

stderr:

00:31:29.360299 git.c:463               trace: built-in: git cherry-pick 41be38220104536a79fdcc476ff93ae872bd4b1c
error: could not apply 41be38220... [IMP] essentials: iap rewrite
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

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

@tiku-odoo tiku-odoo force-pushed the 17.0-15.0-essentials-iap-rewrite-tiku-XUmr-fw branch from 70e1e0e to 65b94f0 Compare April 23, 2024 14:53
@C3POdoo C3POdoo requested review from a team April 23, 2024 14:55
@tiku-odoo tiku-odoo force-pushed the 17.0-15.0-essentials-iap-rewrite-tiku-XUmr-fw branch from 65b94f0 to 8f89a2e Compare April 23, 2024 15:47
@tiku-odoo
Copy link
Contributor

@robodoo r+

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.

None yet

3 participants