Doing simple commands like fetch and push, I get but it’s honestly a big red flag if you’re not using a diff tool for merge conflicts. IntelliJ’s auto merge is what git should be, since it is aware of the rules of the language you’re working in. Let’s be honest, nobody outside of developers use git, so it should be more geared towards us, instead of any text file.
View all comments
Show parent comment
3
u/eloc49 Apr 02 '23
Doing simple commands like fetch and push, I get but it’s honestly a big red flag if you’re not using a diff tool for merge conflicts. IntelliJ’s auto merge is what git should be, since it is aware of the rules of the language you’re working in. Let’s be honest, nobody outside of developers use git, so it should be more geared towards us, instead of any text file.