gitlab-issues-workflow.markdown

@@ -45,8 +45,10 @@ This assumes that you have already installed the [PhpStorm Gitflow](phpstorm-git
     2. From the Gitflow menu, choose **Init Repo**
     3. Click the **OK** button accepting the default settings
         * Gitflow has created a **develop** branch for you, and checked it out
- 2. 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.
+ 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.
  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