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][IMP] academic: only allow academic manager to edit divsion #225

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #220

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@lav-adhoc @matiasperalta1 cherrypicking of pull request #220 failed.

stdout:

Auto-merging academic/__manifest__.py
CONFLICT (content): Merge conflict in academic/__manifest__.py

stderr:

14:39:41.201012 git.c:444               trace: built-in: git cherry-pick efc3be07f2162c0ce64c993582892e591d96d089
error: could not apply efc3be0... [IMP] academic: only allow academic manager to edit divsion
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

@lav-adhoc lav-adhoc force-pushed the 18.0-17.0-t-48969-lav-PxlG-fw branch from 76cd20a to 17da470 Compare March 12, 2025 15:00
@lav-adhoc
Copy link
Contributor

@fw-bot-adhoc r+

@fw-bot-adhoc
Copy link
Contributor Author

@lav-adhoc I can only do this on unmodified forward-port PRs, ask roboadhoc.

@lav-adhoc
Copy link
Contributor

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

3 participants