Here’s the Deal

Gogs vs P4Merge

146 59

271 48

When comparing Gogs vs P4Merge, the Slant community recommends P4Merge for most people. In the question“What are the best merge applications for Git?” P4Merge is ranked 5th while Gogs is ranked 14th. The most important reason people chose P4Merge is:

P4Merge is free of charge.

Specs

PlatformsWindows, Linux, Mac

GitYes

Git LFSNo

MercurialNo

SVNNo

PlatformsWindows; Mac; Linux

LicenseFree

Ranked in these QuestionsQuestion Ranking

Common Questions

What are the best merge applications for Git?

Pros

Pro
Self-hosted

Pro
Very light

Gogs is very light and has very low minimal requirements.

Pro
Excellent performance and efficiency

The fact that it's written in Go means that it has excellent performance even with little resources (less RAM for example).

Pro
Simple installation

The installation process is very simple, just a binary file that needs to be run on the directory where the user wants to install Gogs

Pro
Open Source

Distributed under the MIT license.

Pro
Cross-platform compatibility

Gogs is written in Go, this means that Gogs can be run anywhere that Go can compile. Be it Linux, Windows or OSX.

Pro
Free

P4Merge is free of charge.

Pro
3 way merge support

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

Pro
Detects minimal changes without having a common ancestor

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.

Pro
Also has image diffing

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.