Created
October 24, 2013 19:45
-
-
Save markomafs/7143748 to your computer and use it in GitHub Desktop.
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
# atualizar o repositório local | |
git pull | |
# entrar no branch | |
git checkout MASTER | |
# ele realizará e aplicar um diff entre os branch deixando os arquivos adicionados no git porém pedente de commit, ou seja não realizará um commit automatico do merge | |
git merge FEATURE_DE_77_COMMITS --squash | |
# faça um commit do branch com o comentário que bem entender e todos os commit's do outro branch seram ignorados | |
git commit -a -m'consolidado o branch de 77 commits' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment