What editor to use for React.Js with the ability to conveniently do git merge?

Question

git

With the advent of several people in the repository, it became necessary to merge changes in files. Which editor to use in order to be able to:
- merge with a user-friendly interface;
- it is convenient to develop the front on React.Js;
- interact with folders via SSH (optional).
Solutions are suitable for both Windows and Linux. In the near future I was thinking of switching, since the console is often required at work, and using an external VPS via SSH with the assembled environment is inconvenient. I would be glad for any advice from people who have been working with React for more than a day.
Thanks in advance!

Answer 1

editor? notebook!
ide has been in development for a long time. webstorm, for example.
by the way, mergetool can be external. it is not necessary to use ide means to involve
kdiff3, meld (the first one is also available for Windows)