CODEWITHSUNDEEP
intellij-idea
rweng
rweng

Reputation: 7230

Intellij IDEA diff file compare (without VCS)

I heavily rely on git in my workflow. However, I do not use IDEA's integration since using the shell and aliases has always been faster. Now I noticed that when enabling the VCS-support, there is an Compare with same repository, Compare with branch, Compare with ....

Now I wonder if it is possible to merge a diff file (with all the <<<<<<<). Even when enabling the VCS-support, IDEA does not seem to support that.

Does anyone know if (and how) merging a diff file with IDEA is possible?

Upvotes: 1

Views: 2967

Answers (2)

Kai Huppmann
Kai Huppmann

Reputation: 10775

I'm not sure if that's what you ask. But it's possible to select two files in the project's file browser and compare them by clicking 'Compare Two Files' in the context menu. If you do so the diff/merge dialog will open with same possibilities as when opened with VCS related commands.

Upvotes: 12

osundblad
osundblad

Reputation: 2681

Why don't you just enable the IDEA git integration (to be able to do diffs in IDEA) and keep using the shell for the other git commands. I have worked that way with both Git and Perforce, and IDEA works fine that way.

Upvotes: 0

Related Questions