Skip to content

Instantly share code, notes, and snippets.

@jorgeas80

jorgeas80/check_conflicts.sh

Created January 19, 2017 09:55
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jorgeas80/005b19479244bcfb9db1d5f8b9ac6c74 to your computer and use it in GitHub Desktop.
Save jorgeas80/005b19479244bcfb9db1d5f8b9ac6c74 to your computer and use it in GitHub Desktop.
Download ZIP
Check git conflicts after a merge
Raw
check_conflicts.sh
#!/bin/bash
git diff --name-only --diff-filter=U
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment