I'm using a local testing server and I really like the ability to upload to the remote server upon Commit. But now that I'm branching out (pun intended?) and trying to make better use of git and its branching it seems I can't automatically upload after merging back to my master branch. I also tried telling the Merge dialog box "no commit" so that I could possibly commit as before and see the upload feature, but it doesn't seem to work that way either. Am I missing something? I'm new to both PhpStorm and git so it's quite possible my workflow is off. Any help is appreciated!