Answered by : hachem-madmoun

git fetch && git reset --hard origin/master

Source : https://stackoverflow.com/questions/10697463/resolve-git-merge-conflicts-in-favor-of-their-changes-during-a-pull | Last Update : Tue, 17 May 22