4 ms·
I use CLion (or other Jetbrains IDEs, eg PyCharms on the occasions I'm not working in C/C++/Rust). They've got a very nice built-in 3-way merge diff tool. Non-f
by SAI_Peregrinus 6y ago
I use CLion (or other Jetbrains IDEs, eg PyCharms on the occasions I'm not working in C/C++/Rust). They've got a very nice built-in 3-way merge diff tool. Non-free for some of the IDEs, but if you're working with a language that has a free "community edition" this is viable. Or if you're willing to pay for a very nice IDE.