Created
January 31, 2011 10:57
-
-
Save amuino/803898 to your computer and use it in GitHub Desktop.
Receta para "sincronizar" con 12meses12katas
This file contains 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
# Repo de 12meses12katas añadido como "upstream" | |
git remote add upstream https://github.com/12meses12katas/Enero-String-Calculator.git | |
# Obtener última versión (sin modificar working tree) | |
git fetch upstream | |
# Mezclar los commits de 12meses12katas en nuestro working tree | |
git merge upstream/master | |
## OPCIONALMENTE, se puede hacer git merge --squash upstream/master para "comprimir" | |
## todos los commits en un sólo commit gigante en nuestro repo. | |
# A partir de aquí, git status, git add, git commit, git push… | |
# La pull request debería indicar el número correcto de commits y pulls a enviar |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment