Skip to content

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: #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

stderr:

21:51:12.370494 git.c:463               trace: built-in: git cherry-pick bcb1c6f93984d2ea5f0879f2588758c699f7a430
error: could not apply bcb1c6f93... [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 16.0-15.0-essentials-iap-rewrite-tiku-1D4J-fw branch from 486e5e6 to 41be382 Compare April 22, 2024 20:49
@C3POdoo C3POdoo requested review from a team April 22, 2024 20:50
@tiku-odoo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 22, 2024
closes #8917

X-original-commit: 46d3bdc
Signed-off-by: Timothy Kukulka (tiku) <tiku@odoo.com>
@robodoo robodoo closed this Apr 22, 2024
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