Merging github branches

Hi There,

I'm trying to use the merge feature inside Webstorm 7.0 but I'm just not getting the hang of it. I went to the help on the JetBrains website and followed the instructions by selecting the menu in the bottom right corner but I just keep getting the message "branch up to date". If I select merge from the remote or local I still get the same message. So How can I merge my dev build (local) with the master build (remote) all it seems to be doing is making the branches out of sync.

Thanks in advance

Sean