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

Apuntes que tomé sobre la clase #7

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Apuntes que tomé sobre la clase #7

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2454979
Apuntes sobre git añadidos
IGacitua Apr 5, 2024
520d8eb
Added date
IGacitua Apr 6, 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
16 changes: 16 additions & 0 deletions Apuntes 5.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

Git
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Estaría bueno que pongás de que fecha son!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fecha añadida. Pedido de revisión para merge.


- Ramas
- Permiten evitar conflicto entre los cambios realizados por multiples personas
- Trabaja en una "rama" separada al tronco principal (main) y a cierto punto
la rama se vuelve a unir al tronco
- git checkout -b 'Nombre' crea una rama
- git checkout sin -b permite moverse entre ramas
- Si la rama no existe en el repositorio, hace git push origin nombre_de_rama
- Esto crea la rama en el repositorio
- EN GITHUB para mandar los cambios de tu rama a main, haces una pull request
- Si los cambios que hiciste tienen conflicto con main al momento de mergear,
github intenta solucionarlo, pero generalmente hay que solucionarlo manualmente
- git merge permite traer los cambios de main a la rama en la que estés trabajando
- Para poder ver conflictos entre ramas antes de hacer una pull request