Stack Overflow
Stack Overflow

Questions tagged [beyondcompare4]

Beyond Compare is a data comparison utility. Aside from comparing files, the program is capable of doing side-by-side comparison of directories, FTP and SFTP directories, Dropbox directories, Amazon S3 directories, and archives.[1] It is available for Windows, Mac OS, and Linux operating systems. A strength of Beyond Compare is that it can be configured as difftool and mergetool of version control systems, such as git.

Beyond Compare 4 is a data comparison utility of Scooter Software, Inc.

The programm is capable of doing

  • side-by-side file comparison with special comparison view for tables (csv, Excel) and pictures.
  • side-by-side comparison of directories, FTP and SFTP directories, Dropbox directories, Amazon S3 directories, and archives.
  • 3-way file and directory merging.

It is available for Windows, Mac OS, and Linux operating systems.

A strength of Beyond Compare is that it can be configured as difftool and mergetool of version control systems, such as git.

See also:

77 questions
6
votes
2 answers

3-way merge not working on beyond compare 4 with git

I am unable to do a 3-way merge with beyond compare 4 to resolve any git conflicts. When there are conflicts I type git mergetool it opens a beyond compare tab but instead of a 3-way merge its a normal diff view. The version of Beyond Compare is…
Harsha
  • 263
  • 3
  • 13
5
votes
2 answers

How can I see the xltrail-generated diff of an Excel workbook in Beyond Compare?

I'm using Git for Windows with the xltrail extension to provide a readable output when using git diff . I'm also using the graphical diff/merge tool Beyond Compare 4 Pro which runs when using git difftool and provides a nice…
Andrew Keeton
  • 18,949
  • 6
  • 40
  • 68
4
votes
1 answer

What is the right merge script in the eclipse of using tfvc on MacOS?

How to use beyond compare as the merge tool in eclipse. I am using TFVC on MacOS by eclipse integration plug-in. My merge tool edit scrpts: "/Applications/Beyond Compare.app/Contents/MacOS/bcomp" %1 %2 %3 %4 -lefttitle=%6 -centertitle=%7…
jiexishede
  • 2,193
  • 6
  • 31
  • 49
4
votes
3 answers

Compare files .class Beyond Compare 4

I'm using Beyond Compare 4 (4.1.9) in order to compare war files. I need to compare the files .class that I find in the several packages. How I can compare them using this product (Beyond Compare 4)? Otherwise there is another product which can…
pacio14
  • 261
  • 1
  • 6
  • 16
4
votes
1 answer

Compare two SVN revisions with beyond compare 4

I try to compare two revisions with the folder compare of Beyond Compare 4. But I fail to connect my SVN-folder, I get an error. When I connect to the SVN-repository with my TortoiseSVN, I'm asked for user and password and I'm connected without…
knut
  • 25,655
  • 5
  • 79
  • 107
3
votes
0 answers

Automating merge conflict resolution

I'm using git mergetool with beyondcompare4 for solving git merge conflicts. In my project files I often have tags for date/time/version-list that always gives me an merge conflict. I would like to automate the resolutions of those conflicts. For…
Gintautas
  • 33
  • 3
3
votes
0 answers

Beyond Compare 4 shows "Editing disabled" when resolving a merge from Mercurial

I used Beyond Compare 3 for years as a merge tool. I'm familiar with how it works. I recently installed Beyond Compare 4 (Version 4.2.6) and Mercurial uses it as the visual editing tool for resolving merge conflicts when this command is entered: hg…
user1071914
  • 3,051
  • 10
  • 41
  • 74
3
votes
2 answers

Git merge with beyond compare

I've recently purchased beyond compare pro to merge code shared with git (of which I have a very limited understanding). I now have two branches, a master and a feature. I recently pulled the master from remote so that now the master is a few…
Manfredo
  • 1,330
  • 2
  • 17
  • 46
3
votes
1 answer

Getting Beyond Compare to Match Similar Lines Properly

I am using Beyond Compare 4.1.6 to diff text configuration files. There is one configuration parameter per line, and each line is formatted as follows: := I would like to configure Beyond Compare such that it will align only lines when the : portion…
Dave
  • 1,211
  • 1
  • 14
  • 34
3
votes
2 answers

Beyond Compare 4 failing as git difftool on OSX when already running

I've recently switched to using Beyond Compare as my git difftool/mergetool on OSX. It works fine when Beyond Compare is not already running - git difftool A B works as expected with A appearing in the left pane and B appearing in the right…
DaveAlden
  • 28,327
  • 11
  • 83
  • 137
3
votes
1 answer

MAC OSX, Beyond compare as Perforce's merge tool

As described in the title, I want to config Beyond compare as Perforce merge tool. reference to the following link (http://www.scootersoftware.com/support.php?zz=kb_vcs), I tried these steps: Choose Preferences from the Edit menu. Switch to the…
Leon
  • 1,837
  • 3
  • 17
  • 29
2
votes
2 answers

How to ignore capitalization in Beyond Compare 4

BC4 is currently highlighting lines, even when they differ only by capitalization. I want to ignore those. In Session Settings, I have UN-checked the box labeled "Character Case". I have selected the "Minor" button (sub-text: "Ignore unimportant…
kmote
  • 14,865
  • 10
  • 62
  • 84
2
votes
2 answers

Upgrade Git for Windows when using TortoiseGit?

I am using TortoiseGit v2.8, and my Git version is 2.18.0.windows.1 (according to git --version). I want to upgrade my Git version to the latest version (v2.1), but I am not sure if TortoiseGit will work with v2.21 of Git for Windows. I want to…
webworm
  • 9,413
  • 28
  • 96
  • 186
2
votes
2 answers

Compare diff of multiple files in a single compre window

I've made a simple regex find & replace in my project which affected ~300 files, mostly in 2-5 lines per file. In addition there were some minor tweaks and manual changes to fix irregular case. Now I want to see all diff and compare each change…
ZivS
  • 1,940
  • 1
  • 16
  • 44
2
votes
2 answers

Resolving Merge Conflict in IDE Whilst Retaining 3-Way Merge Info

(I am using SourceTree as my Git tool, Beyond Compare to resolve merge conflicts, and Eclipse as my Java IDE.) The conflict is complex enough that I cannot solve it in the merge tool, and will have to resolve it manually (across multiple…
Mark Chimes
  • 284
  • 1
  • 11
1
2 3 4 5 6