4 ms·
I just want them to make a stand-alone git client - their 3 way merge for merge conflicts is second to none.
by alpo20 6y ago
I just want them to make a stand-alone git client - their 3 way merge for merge conflicts is second to none.
- spockz 6y agoIndeed. And it seems that it is quite separate already UI wise. So why not.
- rufus_foreman 6y agoI think its a step down from Beyond Compare, I've set that up as the diff tool in Intellij before, I might have to do that again in my current environment.
- solarkraft 6y agoAbsolutely! It's an amazing tool, but in my opinion the tight integration actually makes it harder to use at times.
- adieth 6y agoYou can use only the merge functionality - it can be launched from git (via mergetool). I tried to convert from VS Code to PyCharm a while back - I didn't (too familiar with VSC), but I stuck with the merge view for some time - it's absolutely amazing!