iamedu/gist:1041700

Created June 23, 2011 01:24

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/iamedu/1041700.js"></script>
Save iamedu/1041700 to your computer and use it in GitHub Desktop.

Download ZIP

Merge and ignore specific file

Raw

gistfile1.txt

	git merge --no-commit branch
	git checkout --ours -- thefile.ext
	git commit -m "Horrendouse message"

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