TBH I never got on with PyCharm and still use Sublime Text... but I keep PyCharm installed just for the mergetool!