Git Pull utilise les changements entrants.
git pull -s recursive -X theirs <remoterepo or other repo>
Owlitic Wolf
git pull -s recursive -X theirs <remoterepo or other repo>