All Questions
8
questions
-1
votes
2
answers
1k
views
TortoiseGit: How to show files with differences between branches before merging
Merging in TortoiseGit will automatically merge a file to the latest code if there are no conflicts.
However, I'd like to choose some blocks to merge only (the files don't conflict). Is it possible to ...
- 731
2
votes
1
answer
127
views
Compare and partly merge multiple projects without common ancestor
I'm looking for a way to compare/diff 3+ different, strongly related projects, none of which is the others' common ancestor and copy around ("merge") single chunks,
and specifically test files.
I do ...
- 23
1
vote
2
answers
342
views
How can I diff two files and get what is different in the second one as an output
What's easiest way to diff two files, check what is different in the second one and get it as output? I'm comparing two css files, and rest is the same only colors are different.
PS: I also want to ...
- 173
4
votes
1
answer
7k
views
Kdiff3 show conflict even that files have equal text and are binary equals
Like in title. Kdiff3 info dialogue shows that ( i do 2 way merge):
Total number of conflicts: 0
Nr of automatically solved conflicts: 0
Nr of unsolved conflicts: 0
kdiff3 files a and b have equal ...
- 261
0
votes
1
answer
432
views
How can I automatically compare and merge a large number of text files?
Due to a series of technical snafus with Dropbox and Simplenote syncing, my main writing folder, which contains text files mostly in Markdown format, is all messed up.
I have about 500 unique files, ...
- 1,313
22
votes
2
answers
15k
views
Get recursive list of different files in Winmerge (without folder tree/structure)
I prefer Winmerge to Diffmerge, but the one thing I envy is Diffmerge's folder diff feature.
Diffmerge shows, for complicated folders and subfolders, only different files (not folders).
Winmerge ...
- 2,309
32
votes
4
answers
20k
views
interactive/visual merge tool for console?
I'm a big fan of meld - a visual diff and merge tool for Gnome. It shows two files (or directories) side-by-side and with their differences highlighted, and I can easily select which parts I want to ...
- 638
24
votes
6
answers
28k
views
Alternative for WinMerge in Ubuntu
I need to compare/diff/merge files in an easy way. In windows I would use WinMerge. What alternatives for this are available in Ubuntu?
The things I must be able to do:
See 2 files line by line next ...
- 9,576