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.

Sign up for GitHub

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

Jump to bottom

Nueva funcionalidad #186

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Nueva funcionalidad #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2e0e925
primer commit rama pruebas
yowelyo222 Sep 30, 2024
5e7a7e9
segundo commit rama pruebas
yowelyo222 Sep 30, 2024
af0518a
añadimos carpeta ignore
yowelyo222 Sep 30, 2024
12f0345
primer cambio rama nueva funcionalidad
yowelyo222 Sep 30, 2024
c231125
segundo cambio rama nueva funcionalidad
yowelyo222 Sep 30, 2024
d724740
primer cambio rama pruebas
yowelyo222 Sep 30, 2024
b1cac29
segundo cambio rama pruebas
yowelyo222 Sep 30, 2024
5bb2bde
Merge pull request #1 from yowelyo/rama-pruebas
yowelyo Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
carpetaSecreta
password
configuracion
5 changes: 4 additions & 1 deletion diarioAlumno/diarioA.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
Aquí viene tu diario
MI DIARIO (rama nueva-funcionalidad)
1. este es el primer cambio para esta rama
2. este es el segundo cambio que vamos
a hacer para esta rama :)
6 changes: 5 additions & 1 deletion diarios.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.- Creado diario
2.- Actualizado diario Sarosi
3.- Tu diario
3.- Tu diario
RAMA PRUEBAS:
1. primer cambio rama-pruebas
2. segundo cambio rama-pruebas