Question : git pull use incoming changes.
Answered by : owlitic-wolf
git pull -s recursive -X theirs <remoterepo or other repo>Source : https://stackoverflow.com/questions/10697463/resolve-git-merge-conflicts-in-favor-of-their-changes-during-a-pull | Last Update : Tue, 06 Jul 21