nathalie
/
pedi2
3
3
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

WIP: funcion/faltantes-y-sobrantes #40

Draft
atasistro wants to merge 4 commits from funcion/faltantes-y-sobrantes into master
pull from: funcion/faltantes-y-sobrantes
merge into: nathalie:master
Conversation 0 Commits 4 Files Changed 7 +171 -22
atasistro commented 2025-02-08 13:20:47 -03:00
Owner
Copy Link
No description provided.
atasistro added 4 commits 2025-02-08 13:20:48 -03:00
This pull request has changes conflicting with the target branch.
  • app/GrupoDeCompra.php
  • app/Subpedido.php
  • resources/js/components/admin/Body.vue
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b funcion/faltantes-y-sobrantes master
git pull origin funcion/faltantes-y-sobrantes

Step 2:

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff funcion/faltantes-y-sobrantes
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: nathalie/pedi2#40
No description provided.
Delete Branch "funcion/faltantes-y-sobrantes"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?