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 @ c5a7460b
......@@ -82,7 +82,7 @@ These instructions make use of the **Navigation Bar** at the top of the PhpStorm
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.
* **Productivity Tip** - You can also push using the **VCS** > **VCS Operations Popup...** which also has a keyboard shortcut that you should learn (`CONTROL` + `V`).
7. Choose **Finish {TYPE}** from the Gitflow menu in the bottom status bar.
* This will switch back to your **develop** branch, merge in the changes from the issue branch, and then delete your local issue branch.
......