Have been using VSCode for months now and I like it a lot. Only thing I am missing coming from PhpStorm is a good merge tool. For some reason I found JetBrains'

Have been using VSCode for months now and I like it a lot. Only thing I am missing coming from PhpStorm is a good merge tool. For some reason I found JetBrains' one really appealing and I struggle to find 3rd party ones that do not feel clunky.