2

I have no idea how I would implement a DVCS style merge in .NET. From my understanding its a 3way diff using mine, theirs and origin. I did a google search and found http://razor.occams.info/code/diff/ which appears to be a patch kind of merge (mine/original, theirs) which isn't the merge type I want. I tried doing a search with nuget and didn' find a merge there

Is there any 3 way merge libs for .NET?

Samuel Rossille
  • 18,940
  • 18
  • 62
  • 90

1 Answers1

3

You could look at the C# port of JS 3-way merge implementation in Synchrotron, which is a port from the Synchrotron project.

Tao mentioned in in "Any decent text diff/merge engine for .NET?".

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250