Skip to content

Instantly share code, notes, and snippets.

@theSociableme

theSociableme/gist:4279b922b9953db0b7f4

Created June 25, 2014 15:52
Show Gist options
  • Save theSociableme/4279b922b9953db0b7f4 to your computer and use it in GitHub Desktop.
Save theSociableme/4279b922b9953db0b7f4 to your computer and use it in GitHub Desktop.
Download ZIP
Removing conflicted files
Raw
gistfile1.txt
find . -name \*conflicted\* -print0 -exec rm -- {} \;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment