svleeuwen
1/22/2014 - 1:43 PM

Merge feature branch with --no-ff From http://nvie.com/posts/a-successful-git-branching-model/

Merge feature branch with --no-ff From http://nvie.com/posts/a-successful-git-branching-model/

$ git checkout develop
Switched to branch 'develop'
$ git merge --no-ff myfeature
Updating ea1b82a..05e9557
(Summary of changes)
$ git branch -d myfeature
Deleted branch myfeature (was 05e9557).
$ git push origin develop