Resolvendo conflitos Git

git pull force

Alguns comandos para resolver conflitos

git checkout e o arquivo ou pasta
git checkout caminho/caminho/arquivo...
git fetch --all
Then, you have two options:
git reset --hard origin/master
OR If you are on some other branch:
git reset --hard origin/<branch_name>
git fetch origin; git reset --hard origin/<branch>
git pull
git clean  -d  -f .
git clean -d -fx .

Outros

git log HEAD..origin/master

git merge origin/master

git rebase origin/master
git add.
git add nome_arquivo
git reset HEAD config/database.php
git commit -m "correcao Renavam com menos de 11 caracteres inserin
git status
git push -u origin master

1202008_29f8_2.jpg

@cpdrenato ☁️ | Cloud 🔒 | Backup ⚙️ | VPS 💿 | Storages 🖥 | Servidores Dedicados