conquista la galaxia con git
DESCRIPTION
Noviembre de 2012 // Ciball // Symfony Madrid Se detallan algunas caracteristicas de git, y como resolver el problema de trabajar con ramas e ir añadiendo requisitos. Nivel Básico.TRANSCRIPT
![Page 1: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/1.jpg)
CONQUISTA LA GALAXIACONQUISTA LA GALAXIACONQUISTA LA GALAXIACONQUISTA LA GALAXIA
CON GIT
![Page 2: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/2.jpg)
Daniel González
Symfony Madrid
@desarrolla2
![Page 3: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/3.jpg)
EPISODIO IEPISODIO IEPISODIO IEPISODIO I
CONCEPTOS CONCEPTOS CONCEPTOS CONCEPTOS CONCEPTOS CONCEPTOS CONCEPTOS CONCEPTOS
BASICOSBASICOSBASICOSBASICOS
![Page 4: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/4.jpg)
"El emperador está molesto por su aparente falta de progreso"
![Page 5: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/5.jpg)
![Page 6: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/6.jpg)
STAR STAR STAR STAR
WAITWAITWAITWAITWAITWAITWAITWAIT
![Page 7: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/7.jpg)
Remove file Commit file
FILE STATUS LIFECYCLEFILE STATUS LIFECYCLEFILE STATUS LIFECYCLEFILE STATUS LIFECYCLE
untracked unmodified modified staged
Add file Edit file Stage file
![Page 8: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/8.jpg)
![Page 9: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/9.jpg)
![Page 10: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/10.jpg)
![Page 11: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/11.jpg)
"Me ha fallado por última vez almirante"
![Page 12: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/12.jpg)
STAR STAR STAR STAR
WAITWAITWAITWAITWAITWAITWAITWAIT
![Page 13: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/13.jpg)
HOTFIX
DEV
GIT WORKFLOW EXAMPLEGIT WORKFLOW EXAMPLEGIT WORKFLOW EXAMPLEGIT WORKFLOW EXAMPLE
MASTER
FEATURE I
FEATURE II
DEV
![Page 14: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/14.jpg)
Crear el entorno
Primera rama
Ciclo de vida
Segunda rama
Parches
HistoriaHistoria
Diff
Merges
Tags
Remotes / remote branches
Git workflow
![Page 15: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/15.jpg)
EPISODIO IIEPISODIO IIEPISODIO IIEPISODIO II
GIT CONTRATACAGIT CONTRATACAGIT CONTRATACAGIT CONTRATACAGIT CONTRATACAGIT CONTRATACAGIT CONTRATACAGIT CONTRATACA
![Page 16: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/16.jpg)
![Page 17: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/17.jpg)
HEAD
index
branch
tag
commit
commit
.git .git/refs .git/objects
commit
![Page 18: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/18.jpg)
![Page 19: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/19.jpg)
![Page 20: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/20.jpg)
Git internals
Git hooks
Bundle
Blame
Autocompletion
Git prompt
![Page 21: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/21.jpg)
EPISODIO IIIEPISODIO IIIEPISODIO IIIEPISODIO III
LA VENGANZA DEL LA VENGANZA DEL LA VENGANZA DEL LA VENGANZA DEL LA VENGANZA DEL LA VENGANZA DEL LA VENGANZA DEL LA VENGANZA DEL
GITGITGITGIT
![Page 22: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/22.jpg)
FEATURE I
MASTER
FEATURE I
MASTER
![Page 23: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/23.jpg)
FEATURE I
MASTER
FEATURE I
MASTER
![Page 24: Conquista la galaxia con GIT](https://reader031.vdocuments.net/reader031/viewer/2022020116/559b66c01a28ab213c8b4765/html5/thumbnails/24.jpg)
Rebase
Cherry pick
Rewriting history (“upss”)