djburdick/merge_conflicts_take_your_changes

Created March 20, 2013 17:58

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

Select an option

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

Download ZIP

merge conflict; take your changes for a specific file. #git

Raw

merge_conflicts_take_your_changes

git checkout HEAD -- db/schema.rb

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