IntelliJ IDEA vs P4Merge

IDEA places an emphasis in safe refactoring, offering a variety of features to make this possible for a variety of languages.
These features include safe delete, type migration and replacing method code duplicates.

Uses a fast indexing technique to provide contextual hints (auto-completion, available object members, import suggestions).
On-the-fly code analysis to detect errors and propose refactorization.

A very complete development environment support.

IntelliJ supports many languages besides Java, some of these are: golang, Scala, Clojure, Groovy, Bash, etc.

Many plugins are available for almost any task a developer may need to cover. Plugins are developed by Jetbrains themselves or by 3rd parties through the SDK available for writing them.

IntelliJ IDEA hardly ever crashes or has any issues that plague other Java IDEs like file corruption or slowness.

IDEA has a clean, intuitive interface with some customization available (such as the Darcula theme).

The documentation is exhaustive, easy to navigate, and clearly worded.

With ability to step into a certain part of a large method invocation (Shift+F7), drop frame, executing code snippets, showing method return values, etc.

There is a free community edition (open source) and an ultimate edition, which you can compare here.

The ultimate edition is available for free for one year for students but must be registered through an .edu e-mail account.

These simplify the daily work, e.g. copy/cut a whole line without the need to select it.

Verify yourselves as a student to get more perks.

Creating an embedded database, running SQL script in a dedicated terminal, viewing tables and their contents, and creating a connection to an in-memory or embedded database is fully supported.

I pay $24 a month and i have access to all jetbrain peoducts , so i use their many tools , i tried many others like netbeans , eclipse , etc , they re good but intelij is on the space and the sky is the limit . Been using it for 5 years and i cant tell i got frustrated using .it

P4Merge is free of charge.

P4Merge presents merge information in 4 panes - BASE, LOCAL, REMOTE and MERGE_RESULT.

After a merge sometimes you have conflicts. You can resolve them by using a merge tool. You can run git mergetool --tool-help to get more details about what tools are supported.

You will get an output like the following
git mergetool --tool=<tool> may be set to one of the following:

      p4merge
        tortoisemerge
        vimdiff
        vimdiff2
        vimdiff3

The following tools are valid, but not currently available:

        araxis
        bc
        bc3
        codecompare
        deltawalker
        diffmerge
        diffuse
        ecmerge
        emerge
        gvimdiff
        gvimdiff2
        gvimdiff3
        kdiff3
        meld
        opendiff
        tkdiff
        winmerge
        xxdiff

Some of the tools listed above only work in a windowed environment. If run in a terminal-only session, they will fail.

For those who are working in both text based source code or files, as well as images, its nice to have the diff functionality of both present in the same product.

P4Merge works on Windows, Linux and OS X.