Stack Overflow
Stack Overflow

Questions tagged [three-way-merge]

A three-way merge is a merge between a base version of a file and two diverged versions. Three-way merges are the corner-stone of automatic merges in modern version control systems.

More information:

28 questions
2
votes
1 answer

Implementing a three-way diff/merge

I'm trying to implement a three-way diff/merge algorithm (in python) between, say, the base version X and two different derivative versions A and B, and I'm having trouble figuring out how to handle some changes. I have a line-by-line diff from X to…
brianmearns
  • 9,581
  • 10
  • 52
  • 79
2
votes
1 answer

Three-way merge of files (outside version control)

I have three versions of a file: the original, my changes, and someone else's changes. I would like to do a three-way merge to produce a version incorporating both sets of changes (or fail if this is not possible). Note that I am not asking about…
Ed Avis
  • 1,350
  • 17
  • 36
2
votes
2 answers

RCS on Windows - rcsmerge always fails

I'm using GNU RCS version 5.7 for Windows from the official Purdue RCS homepage. If I use the rcsmerge(1) command to merge changes from different branches, I get an error: diff3.exe: subsidiary program failed every time. Does anyone know why this…
Max
  • 2,121
  • 3
  • 16
  • 20
1
vote
1 answer

Can Git track a file change and perform a three way merge?

Not sure three way merge is the correct terminology, so I will describe the capability. Assume you're working on an MCU board library repository Raspberry PI B containing a file RPIB.h containing its pinouts and other definitions. A year later, a…
ATL_DEV
  • 9,256
  • 11
  • 60
  • 102
1
vote
1 answer

Anyone tried DiffMerge as the default 3-way merge tool with Evolphin Zoom Version Control Client?

So far we have been using the MacOS XCode FileMerge/OpenDiff tool as our default 3-way merge tool when resolving conflicts in text files with Evolphin Zoom. Has anyone tried using DiffMerge or other 3-way merging tools? I find FileMerge doing…
TBD
  • 128
  • 8
1
vote
1 answer

Standalone merging / 3-way equivalent of git diff --no-index

We can use git's diff tool without git repos with git diff --no-index . Is there a similar command for running git's merge algorithm given three input files ("ours", base & "theirs")? And specifically it should output the "diff3"…
yairchu
  • 23,680
  • 7
  • 69
  • 109
1
vote
1 answer

Can I get three-way *word* diffs using e.g. dwdiff with diff3?

I know there are GUI's that show word-diffs in three-way diff, and there are command line tools that show two-way word-highlighting diffs. But is there a command-line way I can show three-way diffs with word-higlighting the same way that I can get…
unhammer
  • 4,306
  • 2
  • 39
  • 52
1
vote
3 answers

Three-way compare function for Arrays in Javascript

There have been other questions about How to compare arrays in JavaScript?. What I want to know is the most straightforward way to write/use a three-way comparison function like the one required by Array.sort(). Here's an example using the default…
John Zwinck
  • 239,568
  • 38
  • 324
  • 436
1
vote
1 answer

TFS binary files three way merge with custom tool

I have a tool for three way merge on VBA code inside Excel workbooks - let's call it XlMerge. My Excel workbook resides inside TFS. I hoped that if I add my tool as a user tool it will remove merging headache. But now TFS doesn't show me "merge with…
Vitaliy
  • 702
  • 6
  • 19
0
votes
1 answer

Can liquibase be used to manage two-way changes?

I am new to liquibase, and want to check if this is the ideal tool to handle this. Please suggest others outside of liquibase too, if appropriate. Usecase: We have a property file that the user can modify. We are looking to solutions on utilizing…
jackrabb1t
  • 14,609
  • 1
  • 21
  • 20
0
votes
1 answer

Merge from one branch's working copy to another branch (locally, w/o committing)

Most of my experience is with Perforce and my last svn experiences were ages ago, so I'm not yet that comfortable with (Tortoise) svn (again). I want to move changes over from a working copy to a freshly checked out working copy in another related…
Johann Studanski
  • 1,023
  • 12
  • 19
0
votes
0 answers

Custom merge driver not working in GitKraken

I am trying to use merge-po driver https://github.com/mezis/git-whistles#merge-po for smart merging gettext generated translation *.po files. Driver works just fine in CLI (merged without conflicts) but GitKraken completely ignores custom merge…
Petr Přikryl
  • 1,641
  • 4
  • 22
  • 34
0
votes
1 answer

Combining 2 patch files that patch a number of files in a directory + resolving conflicts

I have a dir with thousands of files and 2 patch files that apply to the same dir. Each patch file patches 20-30 files in dir or it's subdirs. If I apply either patch to the common ancestor dir, it succeeds. But if I apply one patch file followed…
Madiyaan Damha
  • 53
  • 2
  • 4
1
2