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
0
votes
2 answers

trying to setup svn external diff program on mac

I'm having problems trying to setup an external diff program for svn on Mac OSX Lion. I have both xxdiff and opendiff installed. I add these lines to ~/.subversion/config: diff-cmd = opendiff diff3-cmd = opendiff or diff-cmd =…
Eddy
  • 6,661
  • 21
  • 58
  • 71
0
votes
2 answers

Unable to diff dot-files in Mac's FileMerge

I have set my FileMerge not to ignore any file. However, it ignores my dotFiles. How can you make FileMerge to diff dotFiles?
Léo Léopold Hertz 준영
  • 134,464
  • 179
  • 445
  • 697
0
votes
1 answer

Config: Fetch git data then merge it with git mergetool

I've successfully set up Kaleidoscope as my default git difftool, and works like a charm. But when I make a fetch then git difftool, I can see what has changed, yet I cannot choose or merge what I want (at least not through Kaleidoscope). Now, I…
AeroCross
  • 3,969
  • 3
  • 23
  • 30
0
votes
0 answers

Add uploaded PDF file to Word doc generated in front end

Looking for a way to add a user-uploaded PDF file to a Word document generated in the browser. The user fills out a questionnaire and has the option to upload a document. At the end, the user clicks on a button and a Word document is generated with…
Jenny_cgn21
  • 33
  • 1
  • 6
0
votes
0 answers

Merging a Files

My goal to achieve merge long files 500 mb to 1gb File. i have merged all files but the issue is Write a file but memory usage is very low then app crashed. Can you guide me how to cattle this problem.if i merged 46 files then some time show…
Muhammad Bilal Raza
  • 3
  • 3
0
votes
0 answers

To Merge CSV Files in WSO2 EI 6.6.0 using file connector 2.0.24

I am trying FileMerge Operation in WSO2 EI 6.6.0 using FileConnector 2.0.24. The problem here is that it is generating an output file with empty content. API Code:
Justin
  • 855
  • 2
  • 11
  • 30
0
votes
1 answer

Issue converting to .pdf a merged .docx file that opens fine in Word

So, I have the following scenario. I am working on a system for academical papers. I have several inputs that are for stuff like author name, coauthors, title, type of paper, introduction, objectives and so on. I store all that information in a…
Mihail Minkov
  • 2,463
  • 2
  • 24
  • 41
0
votes
1 answer

how do i merge excel files with devexpress

I trying to merge two Excel files with Devexpress library. I don't have any errors but there isn't happening anything. Debug also looking good. I can see sheet names etc. I use this manual to merge…
ordinarymen7
  • 3
  • 2
0
votes
3 answers

Source tree is not launching External merge tool when I choose to resolve conflict using external merge tool

Source tree is not launching external merge tool for few files with extension .java . Source tree is showing conflicts in few files. When I select resolve conflict -> Launch external merge tool, it just shows a popup for less then one second and…
Rohit Ranjan Pandey
  • 481
  • 4
  • 9
0
votes
0 answers

How to get source of new merged image after merged images with Canvas?

I used canvas html tag. And I loaded two images into canvas. And I could saw two images in canvas tag. But when i try to get new image' src by using canvas.toDataURL(), i can't get and i take this error(Tainted canvases may not be…
Sezer K.
  • 9
  • 3
0
votes
1 answer

To output the merged file into a json file

Please let me know how to merge 2 json files into a new json file. I used jq , and used the below command: jq -s add file1.json file2.json > Output.json But I am not getting the output in json ascii encode. While pasing I get an error : Failed…
Nitin Rao
  • 7
  • 1
0
votes
2 answers

Filemerge with git - It's all gone horribly wrong

Following this tutorial to the letter, whenever I now run a diff, I get the following: ~~$ git diff fatal: cannot exec '/Users/john/git-diff-cmd.sh': Permission denied external diff died, stopping at footer.php. This is obviously undesirable!! How…
Mild Fuzz
  • 29,463
  • 31
  • 100
  • 148
0
votes
0 answers

How to get meld to ignore data type differences?

I'm using meld to merge a large file. The compiler for the source platform uses slightly different data type definitions, and it'd help if there were a way to make meld ignore the data type differences. For example, it'd be nice if it would ignore…
Jim Fell
  • 13,750
  • 36
  • 127
  • 202
0
votes
2 answers

combining few jpgs(and a txt) to a single jpg file

I have a sort of a canvas on my site, (not canvas though for the need of support in IE) where images are loaded to and modified. At the end of the process I'd like to take all the files used in the canvas and connect them into a (bigger) jpg. My…
Ido_f
  • 689
  • 1
  • 11
  • 29
0
votes
1 answer

How to integrate FileMerge with Komodo 6 IDE?

After reading this post: http://community.activestate.com/forum/subversion-external-diff-tool I've tried using the following command in the "diff options" text box in preferences > source code control > Subversion but it does not work. --diff-cmd…
gxc
  • 4,946
  • 6
  • 37
  • 55
1 2 3
4
5