Stack Overflow
Stack Overflow

Questions tagged [kdiff3]

KDiff3 is a diff/merge program that compares or merges two or three text input files or directories and shows the differences line by line and character by character (!).

KDiff3 is a diff and merge program that:

  • compares or merges two or three text input files or directories,
  • shows the differences line by line and character by character (!),
  • provides an automatic merge-facility and
  • an integrated editor for comfortable solving of merge-conflicts,
  • supports Unicode, UTF-8 and other codecs, autodetection via byte-order-mark "BOM"
  • supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
  • Printing of differences,
  • Manual alignment of lines,
  • Automatic merging of version control history ($Log$),
  • and has an intuitive graphical user interface.
139 questions
1
vote
0 answers

How to solve rebase conflict in SourceTree

Our workflow is as follows: Create a feature branch Pull from remote create and commit changes to code rebase feature branch with changes made to master by other developers commit changes *continue to commit and rebase to local branch* merge feature…
trevor4n
  • 281
  • 1
  • 3
  • 11
1
vote
1 answer

How to configure kDiff3 as merge tool for Android Studio

I have been loosing code due to poor merging built in to Android Studio (using SVN for source control) how can I configure kDiff3 as the merge tool which Android Studio will use for diff and merge.
Martin Belcher - AtWrk
  • 4,579
  • 4
  • 33
  • 41
1
vote
0 answers

Automatically merge two XML files by selecting both conflicting lines

I have two conflicting files. Here is the first file (a.xml): And here is the second one…
mikedu95
  • 1,725
  • 2
  • 12
  • 24
1
vote
2 answers

Kdiff3: join B and C

I use git and try to merge two branches. I use kdiff3 to solve conflicts. I have a conflict at the same line. I want to join changes from B and C. How to do this?
mtkachenko
  • 5,389
  • 9
  • 38
  • 68
1
vote
1 answer

Jquery updates div inspite of the content being same

So I have a page where I allow the user to view contents from a server log. I want the div to be updated only if the content in the server log has changed. If it is the same as what is there in the div, I do not want any updates. My jquery code…
Undefined Variable
  • 4,196
  • 10
  • 40
  • 69
1
vote
1 answer

How do I run launch kdiff3 as a background process so it accepts two ClearCase version controlled files as parameters?

How do I run launch kdiff3 as a background process so it accepts two ClearCase version controlled files as parameters? When run as a background process, kdiff3 claims it does not have permission to read a file, but it has no permission issues with…
CLSheppard
  • 525
  • 1
  • 6
  • 13
1
vote
1 answer

detect white space difference between two files

We are using git. I am using eclipse. Some of the committers may not be using eclipse. Here's what is happening. I make a small change in an existing file (properties/xml/java) and save it and commit it. gitk (without ignore space change) and…
Indu Devanath
  • 2,068
  • 1
  • 16
  • 17
1
vote
0 answers

launch kdiff3 only during conflicts

I configured mercurial to launch kdiff3 to resolve conflicts during merges. But not kdiff3 pops up every time I do merge, even when there are no conflicts. Is there a way to configure mercurial to launch kdiff3 only when there are conflicts. Here is…
nik
  • 8,387
  • 13
  • 36
  • 44
1
vote
0 answers

GIT merge file contents are incorrect for the file name. (SmartGit/Hg || IntelliJ IDEA) && (P4Merge || KDiff3)

THE PROBLEM In setting up the merge tool to resolve conflicts, the files sent to the merge tool are not correct for the content they contain. I have tried searching Stack Overflow, but have not found an answer. Details I'm new to GIT. In trying to…
nick
  • 11
  • 3
1
vote
1 answer

git difftool files across two branches easily with tab-completion?

The way our git repository and workflow is configured is that we have a branch called "stream-head" which is the mainline repository, and then create separate branches for each ticket that we are committing work on. I often find myself wanting to…
boltup_im_coding
  • 6,345
  • 6
  • 40
  • 52
1
vote
1 answer

mercurial kdiff3 mac is not opening

I am using eclipse with mercurial on my new mac and when I am trying to merge it gives me a message "1 file unresolved" and kdiff3 it's not opening , kdiff3 is the default merge tool right ? If not how can I configure it ?
Petros Calafatidis
  • 11
  • 3
1
vote
1 answer

kdiff: was merge successful

I'm trying to write a merge driver for git that used the kdiff3 for merge and conflict resolution. I need a way to know if kdiff3 was successful in the merge or not. So far I've got this: #!/bin/bash Kdiff3 "${1}" "${2}" "${3}" -o "${1}" --L1…
TechplexEngineer
  • 1,836
  • 2
  • 30
  • 48
0
votes
0 answers

Converting Binary-charSet TXT files to ASCII or UTF-8 -- in Batch -- on MacOS

To eliminate redundancy in text files, I found Kdiff3 has the needed functionality -- just keep the uncolored text. But attempts to automerge flag text files as non-UTF-8 -- despite re-saving as UTF-8. file -I FN.EXT shows them to be binary. I tried…
ericlindellnyc
  • 11
  • 2
0
votes
1 answer

Cannot set KDiff3 as merge/diff tool in GIT

Recently I have been trying to setup KDiff3 as mergetool. So I fetched the program, installed it and wanted to set it as GIT diff and merge tool. In order to do that, I executed command: git config --global merge.tool kdiff3 git config --global…
Michał Turczyn
  • 32,028
  • 14
  • 47
  • 69
0
votes
0 answers

Select merging string only, not all the line in KDiff3

I work on files with long strings and I would like to compare and merge them the way I want after checking all modifications. For exemple, let's say I have fileA.txt: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor…
Hedwin
  • 31
  • 1
  • 6
1 2 3
…
9 10