Skip to content

Lortiz #4

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

Open
Leandro-5 wants to merge 7 commits into
base: lortiz
Choose a base branch
from
Open

Lortiz #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4ca194
elimina mensaje inutil
ZevaGuillo Sep 13, 2024
2d573bb
directorio con archivos
ZevaGuillo Sep 13, 2024
c9fb0df
Esto es un commit con mi nombre
Leandro-5 Sep 13, 2024
ac29e37
Se realizo el commit
Leandro-5 Sep 13, 2024
f1036b1
Se realizo el commit con emoticon
Leandro-5 Sep 13, 2024
c3a1831
Añadir hola.txt
Leandro-5 Sep 13, 2024
1b3b6e2
Resuelto merge conflicto
Leandro-5 Sep 13, 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
10 changes: 7 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# README.md

<<<<<<< HEAD
-Leandro Ortiz ♦♣
-Leandro Ortiz
>>>>>>> test-lortiz
- HOLA MUNDO
- cambio desde feature


- algo mas desde feature commit 2
- cambio desde master
- CAmbios de refactor
- cambio desde github

# Practica para git rebase
# Participantes:
-
Empty file added files/.gitkeep
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions hola.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hola que tal