Created
May 14, 2016 21:43
-
-
Save leandromoh/9d1eca31dc99328c884be435dc7f85d8 to your computer and use it in GitHub Desktop.
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
| dar pull na branch destino pra atualizar a local | |
| dar o merge local nas duas branchs (aqui vai ficar o <<<<<<< HEAD no arquivo) | |
| -commita merge com conflitos | |
| resolvou conflitos nos arquivos da branch de destino (local) | |
| git add nos arquivos que deram conflito, porq automaticamente eles ficam untracked | |
| -commita a resolução de conflitos | |
| git push |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment