Stack Overflow
Stack Overflow

Questions tagged [filemerge]

This tag is used to indicate the process uses the merging of two or more files.

67 questions
67
votes
7 answers

FileMerge quits immediately after launching from SourceTree

I regularly use Atlassian SourceTree (on Mac OS X) to launch FileMerge to resolve git merge conflicts. Out of the blue it has stopped working: when I right click and select Resolve Conflicts > Launch External Merge Tool, FileMerge launches, creates…
Greg Kopff
  • 15,945
  • 12
  • 55
  • 78
57
votes
1 answer

How to use git mergetool's filemerge

The documentation is here: http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html A handy guide is here: http://ryanflorence.com/git-for-beginners/ However, neither of them explain how to use mergetool's filemerge. The guide I read says…
xxjjnn
  • 14,591
  • 19
  • 61
  • 94
46
votes
5 answers

Unable to load platform at path

When using filemerge to solve HG conflict, I got the following error FileMerge[18002:707] Unable to load platform at path /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform
Jayson
  • 2,123
  • 3
  • 19
  • 16
40
votes
5 answers

How do I pipe in FileMerge as a diff tool with git on OS X?

I'm new to git on OS X, and I'm using it via the command line. I come from the world of Tortoise SVN and Beyond Compare on Windows. I want to be able to send diffs to FileMerge. I was able to do this with TextMate simply by using: git diff |…
doug
  • 1,789
  • 3
  • 12
  • 5
30
votes
3 answers

Cleaning up after a conflicted git merge?

I had a small conflict in a .h header file in a project I'm working on. This project is tracked in Git. Fortunately, the conflict was very simple to solve. I used git mergetool And chose the default (opendiff) which seemed to be FileMerge on my Mac.…
Craig Otis
  • 31,257
  • 32
  • 136
  • 234
29
votes
5 answers

How do I open FileMerge.app on Mac OS 10.13+ and Xcode 9+?

I see FileMerge in the Xcode app bundle: /Applications/Xcode.app/Contents/Applications/FileMerge.app I know I can open it on the command line using: open /Applications/Xcode.app/Contents/Applications/FileMerge.app But there seems like there should…
Chris Williams
  • 11,647
  • 15
  • 60
  • 97
23
votes
5 answers

Configuring Mercurial - FileMerge for Apple Mac OS X

How do I configure Apple's FileMerge program to function as Mercurial's merge tool? I have my .hgrc file setup in my home directory and I simply want to configure FileMerge as the merge program.
Frank V
  • 25,141
  • 34
  • 106
  • 144
17
votes
3 answers

FileMerge .nib file type cannot be merged

I am trying to merge two .nib files. FileMerge has no problem showing the comparison of the two files. I am trying to keep all the settings in one file (i.e. right side) except for two settings that I want to copy from the other file (i.e. left…
Mike
  • 331
  • 2
  • 9
16
votes
6 answers

FileMerge error message when used with Git difftool

I use FileMerge as the difftool tool for Git. Recently, I started receiving a weird error message: Unable to load platform at path /Applications/Xcode.app/Contents/ Developer/Platforms/iPhoneOS.platform FileMerge still performs the diff just…
eykanal
  • 26,437
  • 19
  • 82
  • 113
14
votes
7 answers

How to change FileMerge's font/settings/preferences?

For some time now, I can't change FileMerge's font. Then it suddenly started using a Helvetica-like font (sans serif, variable width) for files it doesn't recognize (like typescript source files). That could be changed temporarily to monaco by…
TGV
  • 796
  • 4
  • 8
13
votes
3 answers

git diff with opendiff gives "Couldn't launch FileMerge" error

I have git configured to use ~/bin/opendiff-git.sh as my external diff tool. That script looks like this: opendiff $2 $5 When I try and do a git diff from the command line, I get this message: 2011-02-18 13:58:55.532 opendiff[27959:60f] exception…
Nick Forge
  • 21,344
  • 7
  • 55
  • 78
10
votes
1 answer

How to assign shortcuts to FileMerge

I know you can assign shortcuts by editing the nib file that FileMerge uses, but I have no idea how to do it. I want to replace the "choose left" and "choose right" actions with specific keys on my keyboard (for example, left key and right key). How…
itsmarziparzi
  • 699
  • 7
  • 21
8
votes
6 answers

How to perform a SQL-like Join in Perl?

I have to process some data by combining two different files. Both of them have two columns that would form a primary key that I can use to match them side-by-side. The files in questions are huge (around 5GB with 20 million rows) so I would need an…
sfactor
  • 12,592
  • 32
  • 102
  • 152
8
votes
3 answers

Is there any tool for combining front-end JS files in NodeJS?

I have front-end JS files: -js   -a.js   -b.js   -c.js and I request http://example.com/js/all.js, I will get a file with all contents of a.js, b.js and c.js. Is there any library provides such function in NodeJS?
Kevin
  • 1,147
  • 11
  • 21
6
votes
4 answers

How do you do a 3-way merge in FileMerge?

I see the option for specifying three files (left, right, and ancestor), but it doesn't seem to be possible to actually display the ancestor. The bottom pane shows the result of the merge. I'd rather see what the original content was, so I could…
Mark E. Haase
  • 25,965
  • 11
  • 66
  • 72
1
2 3 4 5