Git Pull Use cambios entrantes.

git pull -s recursive -X theirs <remoterepo or other repo>
Owlitic Wolf