git checkout develop
git merge -s ours master -m "Replace master with develop" --log
git checkout master
git merge develop
git push --all
Created
April 18, 2017 12:37
-
-
Save ihorzenich/d6a2f1701b6a1beb247815167e137b06 to your computer and use it in GitHub Desktop.
Replace master with develop
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment