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

[15.0]base_user_role - add (copy) in order to allow the duplicate #237

Merged
merged 1 commit into from
Sep 11, 2023

Conversation

jdidderen-noviat
Copy link
Contributor

Port from 14.0 - #236

@legalsylvain

@OCA-git-bot
Copy link
Contributor

Hi @jcdrubay, @novawish, @sebalix,
some modules you are maintaining are being modified, check this out!

@legalsylvain
Copy link
Contributor

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 15.0-ocabot-merge-pr-237-by-legalsylvain-bump-patch, awaiting test results.

@OCA-git-bot
Copy link
Contributor

@legalsylvain The merge process could not be finalized, because command git push origin 15.0-ocabot-merge-pr-237-by-legalsylvain-bump-patch:15.0 failed with output:

To https://github.com/OCA/server-backend
 ! [rejected]        15.0-ocabot-merge-pr-237-by-legalsylvain-bump-patch -> 15.0 (fetch first)
error: failed to push some refs to 'https://***@github.com/OCA/server-backend'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@OCA-git-bot OCA-git-bot merged commit db35036 into OCA:15.0 Sep 11, 2023
4 of 6 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 5a6b788. Thanks a lot for contributing to OCA. ❤️

@jdidderen-noviat jdidderen-noviat deleted the 15.0-base_user_role_copy branch September 11, 2023 18:35
SiesslPhillip pushed a commit to grueneerde/OCA-server-backend that referenced this pull request Nov 20, 2024
Syncing from upstream OCA/server-backend (16.0)
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