... | @@ -81,6 +81,8 @@ These instructions make use of the **Navigation Bar** at the top of the PhpStorm |
... | @@ -81,6 +81,8 @@ These instructions make use of the **Navigation Bar** at the top of the PhpStorm |
|
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.
|
|
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.
|
|
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 Operations Popup...** which also has a keyboard shortcut that you should learn.
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
#### Create Merge Request
|
|
#### Create Merge Request
|
... | | ... | |