The way we do it is the following: We test on the feature branches after we merge the latest develop branch code on them. The main reason is that we do not want to “pollute” the develop branch code before a feature is accepted. In case a feature would not be accepted after testing but … 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
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