4 ms·
I personally never had to leave IntelliJ Idea for merge conflict resolution. So I am super used to it and think it is very convenient. [as far as I understand
by lolive 5y ago
I personally never had to leave IntelliJ Idea for merge conflict resolution. So I am super used to it and think it is very convenient.
[as far as I understand this is similar in philosophy to a diff3. True?]
And while searching a bit, it seems that a similar UI is planned for VScode later in May 2022. Cf https://github.com/microsoft/vscode/issues/37350 https://github.com/microsoft/vscode/issues/37350
[Btw, a comment mentions that Sublime Merge already has a UI similar to the one in IntelliJ]
- usr1106 5y agoI have not used IntelliJ for over 15 years and never with git. Cannot comment. But git diff3 style being textual format in one column it sounds surprising that a GUI would use the same approach.