... | ... | @@ -19,9 +19,9 @@ In principal git-flow is a naming convention for our branches: |
|
|
|-----------------------|------------|
|
|
|
| Production Branch | master |
|
|
|
| Development Branch | develop |
|
|
|
| Feature Branch Prefix | feature/ |
|
|
|
| Hotfix Branch Prefix | hotfix/ |
|
|
|
| Release Branch Prefix | release/ |
|
|
|
| Feature Branch Prefix | feature/* |
|
|
|
| Hotfix Branch Prefix | hotfix/* |
|
|
|
| Release Branch Prefix | release/* |
|
|
|
|
|
|
|
|
|
### Create a new feature
|
... | ... | @@ -41,5 +41,5 @@ git merge --no-ff feature/YOURFEATURE |
|
|
git push origin develop
|
|
|
# If you do not have rights to push into develop directly open a merge request.
|
|
|
```
|
|
|
Make sure you set the **--no-ff** tag when you merge your feature into develop. The non fast-forward merge allow to easily revert a single feature, if necessary. The effect of --no-ff is described in detail [here](http://nvie.com/posts/a-successful-git-branching-model/).
|
|
|
Make sure you set the **--no-ff** tag when you merge your feature into develop. The non fast-forward merge allows to easily revert a single feature, if necessary. The effect of --no-ff is described in detail [here](http://nvie.com/posts/a-successful-git-branching-model/).
|
|
|
|