Sutty/containers-nginx
5
0
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity

args-default-actualizados #2

Open
Nulo wants to merge 2 commits from args-default-actualizados into antifascista
pull from: args-default-actualizados
merge into: Sutty:antifascista
Conversation 0 Commits 2 Files changed 1 +3 -3
Nulo commented 2023-08-15 18:20:20 +00:00
Owner
Copy link

incluye #1

incluye #1
fauno was assigned by Nulo 2023-08-15 18:20:20 +00:00
Nulo added 2 commits 2023-08-15 18:20:20 +00:00
usar nombres calificados
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
932627b941 
mejora la seguridad y la compatibilidad
defaultear a los parametros actualizados
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
33a62a9f82 
así no depende de tener parametros seteados externamente
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
This pull request has changes conflicting with the target branch.
  • Dockerfile
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin args-default-actualizados:args-default-actualizados
git checkout args-default-actualizados

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 antifascista
git merge --no-ff args-default-actualizados
git checkout args-default-actualizados
git rebase antifascista
git checkout antifascista
git merge --ff-only args-default-actualizados
git checkout args-default-actualizados
git rebase antifascista
git checkout antifascista
git merge --no-ff args-default-actualizados
git checkout antifascista
git merge --squash args-default-actualizados
git checkout antifascista
git merge --ff-only args-default-actualizados
git checkout antifascista
git merge args-default-actualizados
git push origin antifascista
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
fauno
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: Sutty/containers-nginx#2
No description provided.
Delete branch "args-default-actualizados"

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?