28 questions
Score of -1
2 answers
117 views
diff3 output in git conflict style, including mergeable hunks
I would like to produce a file consisting of the three-way diff of three files, with every difference represented as a conflict in the git style. That is, common lines are shown verbatim, and ...
- reputation score 8278
Score of 2
0 answers
203 views
Python how to diff3 using difflib
I am building a git system as a learning project . I want to do the same operation (which is diff3) as the following code but since I am on windows I cannot call sub process diff3.
def merge_blobs (...
- reputation score 235
Score of 3
2 answers
943 views
Git Merge - Difference Between conflictStyle diff3 and merge
Context
git merge considers the setting merge.conflictStyle in case of merge conflicts.
Possible values are merge (default) and diff3.
I noticed that diff3 sometimes produces much bigger conflicts (...
- reputation score 639
Score of 10
1 answer
4716 views
How do I use "zealous diff3" with git? And what are the pros and cons?
I just read the release notes for Git 2.35.0 (note 2.35.1 is already available though).
In those release notes, I saw that:
"Zealous diff3" style of merge conflict presentation has been ...
- reputation score 140699
Score of 1
1 answer
194 views
How to use diff3 with ed
How to use diff3 together with ed? My attempt below does not match diff3 --merge output, so I must be doing something wrong.
Context: I've ported OpenBSD's diff3prog.c utility to be used in BusyBox, ...
- reputation score 1164
Score of 0
0 answers
286 views
Which Git mergetools can I use with a custom merge driver?
I have written a custom merge driver for JSON which outputs diff3 format. All good visual mergetools I have tried insist on re-merging the file before showing the GUI. Are there any tools which can ...
- reputation score 85
Score of 17
1 answer
6201 views
VimDiff E93: More than one match for RE
So I am new to using vimdiff, however I feel like there is some error. Whenever I try to choose the changes from the remote repository with the command:
:diffg RE
I get the error:
E93: More than one ...
- reputation score 549
Score of 0
1 answer
38 views
Maintain wiki translation
I'm trying to maintain several translations of a project on a wiki. The wiki doesn't support translation, but I can import/export using text files. So for simplicity's sake, let's consider every ...
- reputation score 559
Score of 1
1 answer
3654 views
version control for binary files
I'm in the process of writing a program that will use its own binary format for storing data.
I would like to make possible to have some form of version control, at the very least two different ...
- reputation score 670
Score of 1
1 answer
124 views
how to get chunks in diff3 algorithm implementation
I'm trying to implement diff3 algorithm and currently stuck at chunks creation stage. I already know how to get LCS between original file and "other" file and LCS between original file and "my" file. ...
- reputation score 43
Score of 3
0 answers
123 views
SVN - How to use external diff3 for binary files?
I have some external mydiff3.exe, working with text and binary files.
My svn command line is
svn.exe update my_work_copy_path --diff3-cmd mydiff3.exe
This work well for text files (svn call mydiff3....
- reputation score 5367
Score of 33
1 answer
7800 views
Git - diff3 Conflict Style - Temporary merge branch
I am doing a merge with merge.conflictStyle set to diff3. Normally, this inserts three (3) sections separated by four (4) sets of characters.
The Git Documentation for Merge clearly explains what ...
- reputation score 5015
Score of 105
5 answers
33377 views
Should diff3 be default conflictstyle on git?
Recently I enabled diff3 and it's much easier to resolve conflict now.
Previously in some cases I had to check the log to see why people did this and that to do the merge. But with diff3 the ...
- reputation score 1285
Score of 0
1 answer
405 views
Using diff3 where filenames contain a dash (-)
I'm trying to use diff3 in this way
diff3 options... mine older yours
My problem is that I probably can't use it, since all my 3 files contain a "dash" within.
The manual mentions:
At most one of ...
user1762109
Score of 1
1 answer
78 views
In Git is there a way (or tool) to merge by comparing changes, not files?
In Git the standard merge algorithms let you compare the final state of the files in the two branches, which means I have to remember or guess what the changes leading up to that point in both ...
- reputation score 309
