Git merge hotfix branch into feature branch
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