Skip to content

GitLab

gitlab issues workflow · Changes

Page history
rcabral created page: phpstorm-git-flow authored by Mike McLin's avatar Mike McLin
Hide whitespace changes
Inline Side-by-side
gitlab-issues-workflow.markdown
View page @ 8ba0e0ca
......@@ -49,9 +49,9 @@ This assumes that you have already installed the [PhpStorm Gitflow](phpstorm-git
3. Click the **OK** button accepting the default settings
* Gitflow has created a **develop** branch for you, and checked it out
2. Either track an existing Gitlab issue branch, or create one
* If no branch for the issue exists on Gitlab, choose either **Start Feature**, **Start Release** or **Start Hotfix** from the Gitflow menu.
* The type of branch you want to start should be consistent with type of issue you are trying to complete. If the Gitlab issue has a label of `bug`, then you would choose **Start Hotfix**, if the Gitlab issue has a label of `enhancement`, then you would choose **Start Feature** and so on.
* If an issue branch already exists on Gitlab, choose either **Track Feature**, **Track Release** or **Track Hotfix** from the Gitflow menu. You can now skip to the **Develop, Commit, Push** section.
* If no branch for the issue exists on Gitlab, choose either **Start Feature**, **Start Release** or **Start Hotfix** from the Gitflow menu.
* The type of branch you want to start should be consistent with type of issue you are trying to complete. If the Gitlab issue has a label of `bug`, then you would choose **Start Hotfix**, if the Gitlab issue has a label of `enhancement`, then you would choose **Start Feature** and so on.
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
......