nateware/git_merge_force.sh

Last active August 29, 2015 14:05

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/nateware/415ab65fa73c4c9d9cbf.js"></script>
Save nateware/415ab65fa73c4c9d9cbf to your computer and use it in GitHub Desktop.

Download ZIP

git merge for deployment purposes

Raw

git_merge_force.sh

git merge #{from_branch} -s recursive -X theirs --commit -m 'merge #{from_branch} to #{rails_env}'

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