P4Merge vs GitKraken Client

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.

It's modern and beautiful, it looks clean and refined.

It's simple: the most used features (pull, push, branch, stash, commit) are accessible in one click, and are the only buttons. The other features aren't in complicated menus nor in hundreds of buttons, but rather displayed when you right-click on something.

It gives more space to the commits, i.e. the most important things. In fact, you can collapse or reduce the other menus/windows.

It displays the current path (project, branch) on an horizontal (clickable) bar at the top. It's just a matter of taste but I prefer this to the traditional "tree" view.

It has undo and redo buttons on the main window.

It supports some drag-and-drop gestures (for example: drag-and-droping the local branch to the remote one pushes it).

A lot of care has gone into trying to make GitKraken as easy and intuitive as possible and it show. Every action is quick and painless with no more user interaction than necessary. For example, switching to another branch is as easy as a double-click on the sidebar.

Built on top of Electron, so it runs on Linux, Mac, and Windows.

GitKraken has simple undo/redo buttons that work the same way you'd expect in any other software.

GitKraken can be connected to Github, Gitlab, or Bitbucket accounts through OAuth. From that point onward most if not all actions that are related to these services can be done inside GitKraken. Things like: cloning or forking a repository, adding a remote, pushing to a remote repository hosted on these services can be done inside the app.

You can even manage pull requests inside GitKraken for example. All pull requests for a certain branch for example are shown on that branch's graph.

There are both pro and free versions available. The free version is pretty complete feature-wise for day-to-day operations.

A quick glance at GitKraken's release notes shows how frequently it's updated. Updates are released on a 2-4 week cycle and each one brings new features and bug fixes.

Supports GitFlow out of the box.

GitKraken has a fuzzy finder to switch between repos/files.

GitKraken is easy to use and is brilliant for the beginner developers.

No more eyestrain staring at white screens - GitKraken has a lovely dark theme.