Skip to content

Instantly share code, notes, and snippets.

@A
Last active August 29, 2015 14:16
Show Gist options
  • Select an option

  • Save A/d11d597fce6b6e3587c7 to your computer and use it in GitHub Desktop.

Select an option

Save A/d11d597fce6b6e3587c7 to your computer and use it in GitHub Desktop.
git tips
# Git: list all conflict files
git ls-files -u
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment