My Git Set Up November 2, 2019 Categories engineer Tags os The following is setting up for my os. merge keep local: grep -lr '<<<<<<<' . | xargs git checkout –ours keep others: grep -lr '<<<<<<<' . | xargs git checkout –theirs Share Tweet LinkedIn Reddit Previous My os Set Up