rho/pedi3
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity

feature/columna-totales #4

Open
atasistro wants to merge 46 commits from feature/columna-totales into master
pull from: feature/columna-totales
merge into: rho:master
Conversation 1 Commits 46 Files changed 25 +434 -9132
atasistro commented 2024-07-09 23:28:18 -03:00
Collaborator
Copy link
No description provided.
rho was assigned by atasistro 2024-07-09 23:28:18 -03:00
atasistro added 42 commits 2024-07-09 23:28:19 -03:00
atasistro added 1 commit 2024-07-09 23:45:12 -03:00
atasistro commented 2024-07-09 23:46:16 -03:00
Author
Collaborator
Copy link

Hay que tirar la base de datos abajo y levantarla de nuevo para esta rama.

docker-compose exec app php artisan migrate:fresh --seed

Hay que tirar la base de datos abajo y levantarla de nuevo para esta rama. `docker-compose exec app php artisan migrate:fresh --seed`
atasistro added 2 commits 2024-07-11 21:37:36 -03:00
atasistro added 1 commit 2024-07-11 21:39:49 -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 feature/columna-totales:feature/columna-totales
git checkout feature/columna-totales

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 feature/columna-totales
git checkout feature/columna-totales
git rebase master
git checkout master
git merge --ff-only feature/columna-totales
git checkout feature/columna-totales
git rebase master
git checkout master
git merge --no-ff feature/columna-totales
git checkout master
git merge --squash feature/columna-totales
git checkout master
git merge --ff-only feature/columna-totales
git checkout master
git merge feature/columna-totales
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
rho
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: rho/pedi3#4
No description provided.
Delete branch "feature/columna-totales"

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?