Skip to content

Instantly share code, notes, and snippets.

@austra

austra/gist:53721da86b149718160b

Forked from deevis/gist:359741f1e498da14f9e3
Created October 26, 2015 21:01
Show Gist options
  • Save austra/53721da86b149718160b to your computer and use it in GitHub Desktop.
Save austra/53721da86b149718160b to your computer and use it in GitHub Desktop.
Download ZIP
Choose multiple files from current branch as the 'merge conflict winner'
Raw
gistfile1.txt
# All the files that match with 'coverage' and tell git to use the branch we're on currenthl (ours, opposed to theirs)
git status | grep coverage | sed 's/.*: \(.*\)/\1/g' | xargs git checkout --ours
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment