Git Encontre arquivos com conflitos, listar arquivos com conflito
git diff --name-only --diff-filter=U
Sparkling Sloth
git diff --name-only --diff-filter=Ugit diff --name-only --diff-filter=U
git stash -- > take my project to temp memory
git pull -- > pull the project from GitHub to working directory
(my computer)
git stash pop -- > take my project to my working directory,
fix the conflict and merge the project.
git add .
git commit –m “comment”
git push