Skip to content

Instantly share code, notes, and snippets.

@thebadmonkeydev

thebadmonkeydev/gist:a9efa66121ca9812a4e4

Created January 6, 2016 19:14
Show Gist options
  • Save thebadmonkeydev/a9efa66121ca9812a4e4 to your computer and use it in GitHub Desktop.
Save thebadmonkeydev/a9efa66121ca9812a4e4 to your computer and use it in GitHub Desktop.
Download ZIP
Dry Run a merge for conflicts
Raw
gistfile1.txt
git format-patch master --stdout | git-apply --check
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment