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][FIX] product_management_group: restriction of archiving products of … #620

Open
wants to merge 1 commit into
base: 17.0
Choose a base branch
from

Conversation

fw-bot-adhoc
Copy link

…portal users

Forward-Port-Of: #619

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Author

@lef-adhoc @matiasperalta1 cherrypicking of pull request #619 failed.

stdout:

On branch 17.0-16.0-h-73591-lef-B6-5-fw
You are currently cherry-picking commit 392e2503.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

stderr:

16:32:44.003806 git.c:444               trace: built-in: git cherry-pick 392e2503c99524222ae1a83dc9fabc1e6a2c608f
16:32:44.026166 run-command.c:664       trace: run_command: git commit -n --no-gpg-sign -F .git/MERGE_MSG --cleanup=verbatim --allow-empty-message
16:32:44.027509 git.c:444               trace: built-in: git commit -n --no-gpg-sign -F .git/MERGE_MSG --cleanup=verbatim --allow-empty-message
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
----------
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

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

3 participants