Created
June 21, 2017 00:21
-
-
Save kelvearagao/c283ca2e18aa3638f97eee01a1d98321 to your computer and use it in GitHub Desktop.
Comandos para resolução de conflitos com git
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
| # prevalecer a versão do branch atual | |
| $ git checkout --ours <path do arquivo> | |
| # prevalecer a versão do outro branch | |
| $ git checkout --theirs <path do arquivo> | |
| # voltar pra versão inicial do conflito | |
| $ git checkout -m <path do arquivo> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment