Jetbrains has a very robust Git integration with merge control features where you can cherry pick with a view of current state of the branch you are pulling the latest state of your branch and the current state of your branch. The only thing I haven't seen webstorm do for me is preview the website in the IDE but I don't see a great use for that feature.