Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Nov 17, 2023

The tour utils were red and moved in Odoo (odoo/odoo#107618).

Forward-Port-Of: #6496

@robodoo
Copy link
Collaborator

robodoo commented Nov 17, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 17, 2023

@rrahir @AntoineVDV cherrypicking of pull request #6496 failed.

stdout:

Auto-merging locale/sources/developer.pot
CONFLICT (content): Merge conflict in locale/sources/developer.pot

stderr:

20:17:12.325525 git.c:463               trace: built-in: git cherry-pick 986aaa2bd41729255f47a76bfa8920a13e4b91ec
error: could not apply 986aaa2bd... [FIX] dev/reference: Fix external reference
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.

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

The tour utils were red and moved in Odoo (odoo/odoo#107618).

X-original-commit: 1746c57
@rrahir rrahir force-pushed the 17.0-saas-16.3-fix-external-test-ref-rar-xDm6-fw branch from cd60da1 to 940ded5 Compare November 20, 2023 06:55
@rrahir
Copy link
Contributor

rrahir commented Nov 20, 2023

on tente
@robodoo r+

@C3POdoo C3POdoo requested review from a team, rco-odoo and xmo-odoo and removed request for a team November 20, 2023 06:57
@robodoo robodoo closed this in 9be2b43 Nov 20, 2023
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