Create a gist now

Instantly share code, notes, and snippets.

What would you like to do?
Manual "Merge and rebase"
git checkout my-new-feat
git rebase master
git checkout master
git merge my-new-feat --ff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment