Upload on Merge?

Hi there.

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!

2 comments
Comment actions Permalink

Hello Ciclone,

Currently uploading changes on Merge operation is not supported, so please file feature request at http://youtrack.jetbrains.net/issues/WI#newissue=yes. Workaround is exactly what you're trying to do: use 'no commit' option and then do "regular" commit. This is expected to work, and if it does not please file bug report [to the URL above] with a screenshot of your Commit dialog.

Regards,
Kirill

0
Comment actions Permalink

Thanks for the quick response. I created the feature request here:

http://youtrack.jetbrains.net/issue/WI-5147?projectKey=WI

About the workaround, the problem I'm having is that when I merge with the "no commit" option, the master branch (after synchronize) is showing no changes detected and therefore not giving me a commit dialog anymore. It seems as though it may actually be committing it anyway. I'll file a bug if that is indeed a bug, but want to be sure I'm not messing something up.

EDIT: OK. I figured out I need to add "No fast forward" as well, to ensure I see can use the commit dialog. Thanks again!

0

Please sign in to leave a comment.