This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
.. luego de haber hecho tus cambios sin aplicar add ni commit y querés aplicar pull se hace lo siguiente: | |
el git stash almacena una rama temporal donde toma tus cambios | |
$ git stash | |
aplicamos el pull correspondiente.. | |
$ git pull origin [mi-rama] | |
y luego retornamos los cambios de la rama temporal | |
$ git stash apply stash@{0} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
############################################# | |
# Push de la rama actual | |
git push origin $rama_actual | |
############################################# | |
# Volver a un commit anterior, descartando los cambios | |
git reset --HARD $SHA1 | |
############################################# | |
# Ver y descargar Ramas remotas |