Add to Chrome
Add to Edge
Add to Firefox
Add to Opera
Add to Brave
Add to SafariWhat is the best alternative to Beyond Compare?
Top Con
Top Pro
Top Pro
Top Pro
Top Con
Top Con
Top Con
Top Con
Top Pro
Top Con
Top Pro
Top Con
Top Pro
4 sub-windows (when you really only need 3), a lot of different colors and even more confusing result-window. No links what has changed between versions and and the result. It clearly shows it's dated or rather outdated. Great if you ever need to do a command line merge, otherwise it sucks. See More
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. See More
Three comparison panes with horizontal and vertical layouts Integrates with version control systems as the merging tool for conflicting file revisions Non-conflicting changes are merged automatically Merging conflicts are highlighted One-click conflict resolution with a mouse button See More
Most compare tools mark every changed line with colour, making the code just a mess with thousands of coloured lines, while all that might be changed is a sign/character on each line. Code Compare draws boxes around each changed segment and highlights only the real change with a colour. See More
The latest version (2.16.0) was released in November 2018. Before that the last official release was made in 2013. The 2.16.0 is actually one of the two forks (Winmerge-v2-jp) that were kept maintained throughout the years, it just got named as the official release. The other fork, WinMerge2011 is still being actively developed too. It's on par with the historical version, and has additional features such as showing only differences and a 64-bit version. An 'official' list of forks is maintained here. See More
Sublimerge can only compare entire file diffs, but not two selections within a file. Comparing within files can be useful for example, by refactoring two similar functions to use a shared function. With Sublimerge, you need to copy the sections into two new temporary tabs and compare between the two. This can be cumbersome, as if you have another untitled file, you won't be able to know which one is which. See More
Allegedly, VS Code is "lightweight". Yet, running multiple instances of it at once, you may get many "out of memory" messages from Windows despite 16 GB RAM. (While of course also running other things. The point is the comparison with some other IDEs/editors where running them alongside the same number of other applications doesn't cause Windows to run out of memory) See More
Seems like hotkeys assignment in Idea has no logical consistency. Like «F3» is usually next match, «Ctrl+W» - close tab, etc — they map to some different action by default. There is a good effort in making the IDE friendly for immigrants from other products: there are options to use hotkeys from Eclipse, and even emacs. But these mappings are very incomplete. And help pages do not take this remapping into account, rather mentioning the standard hotkeys. So, people coming from other IDEs/editors are doomed to using mouse and context menus (which are rather big and complex). See More
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). See More
Like most Electron apps, GitKraken has some memory-related issues. For starter, it requires more memory for an action than an equivalent non-Electron application. Although this should not be a problem most of the time for people who use machines with lots of RAM (after all, RAM is pretty cheap nowadays), it can have some issues when opening large repositories and there have been cases where GitKraken failed to open very large repositories or started lagging once they were opened. See More
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. See More
In most cases of Merge Conflicts, users are stuck with auto-merge or manually resolving it by hand. This is because in the Free Tier, users can only (1) Keep File (ver 1), (2) Keep File (ver 2), (3) Auto-merge, or (4) Use External Merge Tool. In addition, using External Merge Tools is very limited because GitKraken (all tiers) restricts External Merge Tools to only those it managed to Auto-detect. It also does not support custom arguments for the External Tools. Modifying the merge output directly, or Selecting lines to keep/discard, is a Paid Feature. See More
The user interface is designed excellently, and it's really fast to navigate with mouse or keyboard. It's never obscured which git commands are used, and commands can be modified/extended if desired. The visual appearance of the interface can be changed via themes, new git commands can be added, and even the menus can be extended. See More