highly recommend webstorm for IDE, Beyond Compare for diff tool and GitKraken if you aren't trying to be a command line warrior for git