gitlab-issues-workflow.markdown

@@ -50,7 +50,7 @@ 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. If you would like to create the branch on Gitlab (for collaborative purposes), you can choose **Publish Feature** from the Gitflow menu. 
+ 5. Create the branch on Gitlab (for collaborative purposes), by choosing **Publish Feature** from the Gitflow menu. 
 
 ##### PhpStorm Workflow
 
@@ -78,6 +78,7 @@ There are several ways to access the Git commands in PhpStorm.  These instructio
     * **NOTE**: You will not see these commit messages in the Issue comments until your branch has been merged into the **master**.
  3. Push the branch to Gitlab (origin) using the same name for the remote branch as the local branch that was created for the issue.
  4. Repeat until issue is resolved.
+ 5. Pull from `origin/master` and merge into your local issue branch and then push the issue branch one more time to the origin (Gitlab) before moving on to "creating a merge request" step.
 
 ##### PhpStorm Workflow
 
@@ -90,6 +91,10 @@ There are several ways to access the Git commands in PhpStorm.  These instructio
  3. After filling out your commit message, you can choose to Commit and Push, or just Commit.  Just note that a **Push** is required either then or later on to have your commits show up on Gitlab.
  4. When you do push, within the **Git Push** popup window you'll notice towards the bottom that it will push to the **origin** and use the same branch as your issues branch.  Click the **Push** button to push your commits to Gitlab (origin).
  5. Repeat until resolved.
+ 6. Once you are completely done you will want to pull from `origin/master` and push one final time.
+    1. Open the Git {ISSUE BRANCH NAME} menu in the bottom status bar and choose `master -> origin/master` > `merge`. This will add any changes that have been pushed to the project to your branch.
+    2. Push the issue branch to the origin (Gitlab) by choosing `VCS` > `Git` > `Push...` from the top PhpStorm menu.
+        * **Productivity Tip** - You can also push using the **VCS Operations Popup...** which also has a keyboard shortcut that you should learn.
 
 
 #### Create Merge Request