More than 5 years have passed since last update.

[Git] Fix massive conflict files with command

Last updated at 2018-02-19Posted at 2018-02-19

git status | grep both | awk -F ' ' '{printf "%s\n", $3}' | xargs -J % git checkout --ours %

Explanation:

git status
List changed files

grep both
Pick up conflict files.

awk -F ' ' '{printf "%s\n", $3}'
Get the file names. The third column separated with space.

xargs -J % git checkout --ours %
For each file check out ours.