PhpStorm and VCS: How to handle with the fourth branch?
Hello!
If a project already exists on Bitbucket with three branches (Master, Staging, Production)
and it is foreseen that a development of a new extension takes a long time (weeks or months),
then it is a good idea to create a fourth branch on bitbucket.
If the new extension is not yet finished, but a bug fixation has to be made in the project,
which has nothing to do with the development of the new extension, so we still have the possibility
to fix this bug and then go on further to develop the new extension.
I see in PhpStorm that there are many commands pop up by clicking the menu VCS/Git/Branches...
How is the right workflow in PhpStorm for this process (check out as, commit, merge, ...)?
Thank you in advanced!
Please sign in to leave a comment.
1. Switch to the branch where you want to fix a bug
2. Fix the bug, commit and push the changes
3. Switch back to the branch with the new feature
4. When you finish with development, merge the feature branch into the staging branch
Thank you for your feedback. I am not familar with... could you please show more detail what menue point could be clicked?
1. Switch to the branch where you want to fix a bug (switch with which menu command?: Menu/VCS/Branches/New Branch or Check out Tag or Revision... or what?)
2. Fix the bug, commit and push the changes
3. Switch back to the branch with the new feature (switch with which menu command?)
4. When you finish with development, merge the feature branch into the staging branch (switch with which menu command?)
> switch with which menu command?: Menu/VCS/Branches/New Branch or Check out Tag or Revision... or what?
It's VCS - Branches: https://www.jetbrains.com/help/phpstorm/managing-branches.html. Checkout is for switching to the branch you need (PhpStorm uses standard version control terminology, just as any other software/tool).
> switch with which menu command?
Please check https://www.jetbrains.com/help/phpstorm/accessing-git-branches-popup-menu.html for merging.
Thank you! It helped me!