Resolving Conflict during Merge & Git pull from Command Prompt. 5:46 | A processar vídeo... A Carregar... Transferir