Skip to content

Instantly share code, notes, and snippets.

@buurzx
Last active May 23, 2017 09:00
Show Gist options
  • Save buurzx/7cf3cdab68a0543b85734a3d9c7e39f5 to your computer and use it in GitHub Desktop.
Save buurzx/7cf3cdab68a0543b85734a3d9c7e39f5 to your computer and use it in GitHub Desktop.
It's a set of scripts he created for that workflow.
But to answer your question:
$ git checkout -b myFeature dev
Creates MyFeature branch off dev. Do your work and then
$ git commit -am "Your message"
Now merge your changes to dev without a fast-forward
$ git checkout dev
$ git merge --no-ff myFeature
edit
Now push changes to the server
$ git push origin dev
$ git push origin myFeature
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment