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

funcion/actualizaciones #48

Open
atasistro wants to merge 47 commits from funcion/actualizaciones into master
pull from: funcion/actualizaciones
merge into: nathalie:master
Conversation 0 Commits 47 Files changed 47 +4315 -26576
atasistro commented 2025-07-08 16:22:48 -03:00
Owner
Copy link
No description provided.
atasistro added 21 commits 2025-07-08 16:22:50 -03:00
atasistro added 13 commits 2025-07-08 20:32:05 -03:00
atasistro added 1 commit 2025-07-08 20:47:10 -03:00
atasistro added 3 commits 2025-07-20 11:48:55 -03:00 
# Conflicts:
#	package-lock.json
#	resources/js/components/comisiones/Body.vue
#	resources/js/store/modules/comisiones/index.ts
#	resources/js/store/modules/pedido/index.ts
atasistro added 4 commits 2025-07-31 19:41:48 -03:00
atasistro added 1 commit 2025-07-31 19:44:39 -03:00
atasistro added 1 commit 2025-07-31 19:47:34 -03:00
atasistro added 2 commits 2025-07-31 20:11:30 -03:00
atasistro added 1 commit 2025-07-31 20:21:17 -03:00
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin funcion/actualizaciones:funcion/actualizaciones
git checkout funcion/actualizaciones

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff funcion/actualizaciones
git checkout funcion/actualizaciones
git rebase master
git checkout master
git merge --ff-only funcion/actualizaciones
git checkout funcion/actualizaciones
git rebase master
git checkout master
git merge --no-ff funcion/actualizaciones
git checkout master
git merge --squash funcion/actualizaciones
git checkout master
git merge --ff-only funcion/actualizaciones
git checkout master
git merge funcion/actualizaciones
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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#48
No description provided.
Delete branch "funcion/actualizaciones"

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?