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] public_budget: permiso wizard full user a wirzard preventive change position #495

Closed

Conversation

fw-bot-adhoc
Copy link

Ticket: 63466

Forward-Port-Of: #494

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Author

@pablohmontenegro @nicomacr cherrypicking of pull request #494 failed.

stdout:

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

stderr:

13:50:58.541602 git.c:444               trace: built-in: git cherry-pick 165c8803963e5991319c2093b05c960fc0f04ab1
error: could not apply 165c880... [FIX] public_budget: permiso wizard full user a wirzard preventive change position
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

@nicomacr nicomacr force-pushed the 16.0-15.0-h-63466-pam-Zmyu-fw branch from 5adc5e3 to 7617a32 Compare July 24, 2023 17:46
@nicomacr
Copy link
Contributor

@roboadhoc r+ override=ci/sipreco

@roboadhoc
Copy link

I'm sorry, @nicomacr: you are not allowed to override this status.

@roboadhoc roboadhoc closed this in 01280c4 Jul 24, 2023
@roboadhoc roboadhoc temporarily deployed to merge July 24, 2023 17:51 Inactive
@roboadhoc roboadhoc added the 15.1 label Jul 24, 2023
@nicomacr nicomacr deleted the 16.0-15.0-h-63466-pam-Zmyu-fw branch July 25, 2023 16:27
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

4 participants