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

[MIG] stock_ux: Migration to 17.0 #423

Closed
wants to merge 1 commit into from

Conversation

jcadhoc
Copy link
Contributor

@jcadhoc jcadhoc commented Dec 20, 2023

No description provided.

@roboadhoc
Copy link
Collaborator

@mav-adhoc
Copy link
Contributor

@roboadhoc r+

@roboadhoc
Copy link
Collaborator

@jcadhoc @mav-adhoc because this PR has multiple commits, I need to know how to merge it:

  • merge to merge directly, using the PR as merge commit message
  • rebase-merge to rebase and merge, using the PR as merge commit message
  • rebase-ff to rebase and fast-forward

@mav-adhoc
Copy link
Contributor

@roboadhoc rebase-ff

@roboadhoc
Copy link
Collaborator

Merge method set to rebase and fast-forward.

@roboadhoc
Copy link
Collaborator

@jcadhoc @mav-adhoc unable to stage: merge conflict

Task: 35651
Permitir ingresar a pedidos de existencia a usuarios que no tienen permiso de Administración/Settings

closes ingadhoc#454

X-original-commit: db48b24
Signed-off-by: Katherine Zaoral <kz@adhoc.com.ar>
Signed-off-by: pablohmontenegro <pam@adhoc.com.ar>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants