Skip to content

Instantly share code, notes, and snippets.

@Swop

Swop/gist:6a5f1999e1a04227e382

Created December 11, 2014 10:17
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 Swop/6a5f1999e1a04227e382 to your computer and use it in GitHub Desktop.
Save Swop/6a5f1999e1a04227e382 to your computer and use it in GitHub Desktop.
Download ZIP
Git merge test command (to detect potential conflicts)
Raw
gistfile1.sh
#!/bin/bash
git config --global alias.mergetest '!f(){ git merge --no-commit --no-ff "$1"; git merge --abort; echo "Merge aborted"; };f '
@sureshshrestha
Copy link

Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment