... | ... | @@ -50,7 +50,9 @@ This assumes that you have already installed the [PhpStorm Gitflow](phpstorm-git |
|
|
3. Name the new branch (Gitflow will prepend either `feature/`, `release/` or `hotfix/` to the branch name for you)
|
|
|
* The name should be a lowercased, dash-separated and a potentially shorter version of the Gitlab Issue **Subject** - e.g. `restrict-droppable-for-draggables`
|
|
|
4. Gitflow created the branch (based on your **develop** branch), and checked it out
|
|
|
5. Create the branch on Gitlab (for collaborative purposes), by choosing **Publish Feature** from the Gitflow menu.
|
|
|
5. Link to issue branch on origin (Gitlab)
|
|
|
* If an issue branch hasn't been created on Gitlab, create one (for collaborative purposes), by choosing **Publish {TYPE}** from the Gitflow menu. This will also link your local issue branch to the remote one just just created.
|
|
|
* If the issue branch has already been created on Gitlab, choose **Track {TYPE}** from the Gitflow menu and choose the origin (Gitlab) branch you want your local issue branch to be linked to.
|
|
|
|
|
|
#### Develop, Commit, Push
|
|
|
|
... | ... | |