ok, so I can't seem to figure out merging with PhpStorm. I really couldn't find any good articles/posts on how to that didn't end with "yeah, PhpStorm sucks for merging branches."
Branching I seem to have down:
Version Control->Subversion->Branch or Tag
And then update the current directory with that branch.
Does that sound about right?
But merging... Man... I have no clue what to do. There's this "merge from" option, but it either doesn't work or is just not intuitive at all.
So I have
1) How do I update my local copy of coolstuff to have all the changes that have happened in trunk?
2) How do I integrate the coolstuff branch back into trunk?