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] sales: subscriptions follow up alerts add iap #8881

Conversation

fw-bot
Copy link
Collaborator

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

@robodoo
Copy link
Collaborator

robodoo commented Apr 19, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 19, 2024

@tiku-odoo @samueljlieber cherrypicking of pull request #8822 failed.

stdout:

Auto-merging content/applications/sales/subscriptions/automatic_alerts.rst
CONFLICT (content): Merge conflict in content/applications/sales/subscriptions/automatic_alerts.rst

stderr:

21:39:25.408064 git.c:463               trace: built-in: git cherry-pick bd97c88df1716aaf1d7f4f8b95f4c999ff8021a5
error: could not apply bd97c88df... [IMP] sales: subscription follow-up alerts add block
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

@samueljlieber samueljlieber force-pushed the 17.0-15.0-sales-subscriptions-follow-up-alerts-add-iap-tiku-hfjD-fw branch 2 times, most recently from 482b385 to 90dc97a Compare April 19, 2024 19:54
@C3POdoo C3POdoo requested a review from a team April 19, 2024 19:55
@samueljlieber samueljlieber force-pushed the 17.0-15.0-sales-subscriptions-follow-up-alerts-add-iap-tiku-hfjD-fw branch from 90dc97a to 99a5939 Compare April 19, 2024 20:05
@samueljlieber samueljlieber removed the request for review from a team April 19, 2024 20:06
@samueljlieber samueljlieber force-pushed the 17.0-15.0-sales-subscriptions-follow-up-alerts-add-iap-tiku-hfjD-fw branch from 99a5939 to 3c07eb0 Compare April 19, 2024 20:16
@samueljlieber
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

4 participants