git checkout develop-upstream
git merge --ff-only develop
git push upstream develop-upstream:develop
git checkout develop
git push
Last active
November 13, 2015 03:53
-
-
Save OmgImAlexis/8f1e44c091be50255d38 to your computer and use it in GitHub Desktop.
Merge without commit hell
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment