Skip to content

Instantly share code, notes, and snippets.

@markomafs
Created October 24, 2013 19:45
Show Gist options
  • Save markomafs/7143748 to your computer and use it in GitHub Desktop.
Save markomafs/7143748 to your computer and use it in GitHub Desktop.
# 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