gitlab-issues-workflow.markdown

@@ -36,6 +36,22 @@ This guide takes you step-by-step through our Gitlab workflow from issue to comp
  5. Create remote branch by pushing to origin using the same branch name.
  6. Begin development
 
+##### PhpStorm Gitflow Workflow
+
+This assumes that you have already installed the [PhpStorm Gitflow](phpstorm-git-flow) plugin. All interaction with Gitflow is done via the **Gitflow** menu towards the right-side of the PhpStorm **Status Bar**, which is located at the bottom of the screen. If you do not see your status bar, make sure to enable the **View** > **Status Bar** option in your PhpStorm menu.
+
+ 1. If the Gitflow menu says *"No Gitflow"*, install Gitflow for the project
+    1. Make sure your working directory is clean *(you don't have any files that are being tracked and have been modified, but not committed)*.
+    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.
+ 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. If you would like to create the branch on Gitlab (for collaborative purposes), you can choose **Publish Feature** from the Gitflow menu. 
+
 ##### PhpStorm Workflow
 
 There are several ways to access the Git commands in PhpStorm.  These instructions make use of the **Navigation Bar** at the top of the PhpStorm window and the **Status Bar** at the very bottom of the PhpStorm window.  Make sure they are visible by enabling the **View** > **Navigation Bar** and **View** > **Status Bar** menu items.