Skip to content

Conversation

@fw-bot
Copy link
Collaborator

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

This PR adds a new doc detailing how to create and process Take a Picture quality checks.

NOTE: One of the checks is failing because the PR contains a reference to the "Quality checks" doc, which is not yet live. That doc should be live before this one, at which point the ref tags in this doc will work as intended.

Forward-Port-Of: #5939

@robodoo
Copy link
Collaborator

robodoo commented Nov 23, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 23, 2023

@hojo-odoo @StraubCreative cherrypicking of pull request #5939 failed.

stdout:

Auto-merging content/applications/inventory_and_mrp/quality/quality_check_types.rst
CONFLICT (content): Merge conflict in content/applications/inventory_and_mrp/quality/quality_check_types.rst

stderr:

02:57:48.010872 git.c:463               trace: built-in: git cherry-pick 7ca01251f451d4e06012993884278b1cdc653ceb
error: could not apply 7ca01251f... [ADD] Quality: Take a Picture Check
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

@samueljlieber samueljlieber force-pushed the saas-16.1-16.0-quality-add-picture-check-hojo-_RSy-fw branch from 26dede9 to eab1ae5 Compare November 27, 2023 21:27
@C3POdoo C3POdoo requested review from a team November 27, 2023 21:29
@samueljlieber
Copy link
Contributor

Resolved merge conflict in eab1ae5

@samueljlieber
Copy link
Contributor

@robodoo retry

@robodoo
Copy link
Collaborator

robodoo commented Nov 27, 2023

I'm sorry, @samueljlieber. I'm afraid I can't do that.

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

5 participants