Skip to content

[FW][BF]website_sale_advanced_tracking:fix purchase event #377

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

Closed

Conversation

fw-bot-adhoc
Copy link

Forward-Port-Of: #375
Forward-Port-Of: #374

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Author

@cem-adhoc @augusto-weiss cherrypicking of pull request #374 failed.

stdout:

Auto-merging website_sale_advanced_tracking/views/templates.xml
Auto-merging website_sale_advanced_tracking/__manifest__.py
CONFLICT (content): Merge conflict in website_sale_advanced_tracking/__manifest__.py
Auto-merging google_tag_manager_advanced_tracking/static/src/js/website_sale_tracking.js

stderr:

16:21:09.757197 git.c:444               trace: built-in: git cherry-pick dde74803fd8a06642928a71489273ab05c2a7e9a
error: could not apply dde7480... [BF]website_sale_advanced_tracking:fix purchase event
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
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.

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

@JrAdhoc
Copy link
Contributor

JrAdhoc commented May 29, 2025

@roboadhoc 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.

4 participants