I have been reading "A successful git branching model" (http://nvie.com/git-model) which advocates using a feature branch of git for each feature that you develop.
This seams to be the a similar model to the PhpStorm 'Tasks' operation in the menu bar.
The other day i had 2 tasks open (working in my 'development' branch of git) and was switching between them. when i opened a TASK #1 and altered a file (somefile.php) then changed tasks and alterd the same file (somefile.php) while in TASK #2 I got a conflict warning of "File from non-active changelist is modified" 'move changes' 'switch changelists' 'ignore'
making it so that i can only work on a single file (somefile.php) in one task at a time.
I was wondering if instead of chaging tasks in the same git branch that if when i changed tasks that it would also mean changing branches that this conflict could be avoided.
is it possible to have a task-like dropdown for the git branches? or to associate a task with a git feature branch?
Looking for a nice workflow. Thanks.