In the git-flow model, your “latest released” version actually maps to the master, while your “preview release” maps to a git-flow release branch. It is forked from develop and finally merged into master when the actual release happens. Then this will become your “latest release” and you will usually fix only bugs for that release, … Read more
How do we merge the master branch into the feature branch? Easy: git checkout feature1 git merge master There is no point in forcing a fast forward merge here, as it cannot be done. You committed both into the feature branch and the master branch. Fast forward is impossible now. Have a look at GitFlow. … Read more
That issue (dev branch polluted by “non-approved but already integrated” feature branches) is exactly what describe Raman Gupta in “How the Creators of Git Do Branching“. (GitHub repo for this workflow: rocketraman/gitworkflow) In your case (gitflow), you would need to revert the merge commit of the non-approved features before merging dev to release. But the … Read more
If you like the method in the link you’ve posted, have a look at Git Flow. 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 … Read more