Stack Overflow
Stack Overflow

Questions tagged [3-way-merge]

A three-way merge is where an original file (ancestor or base) is merged with two other versions of the same file (children). The goal is to create a new file that is derived from the ancestor and contains modifications between ancestor and child 1, and modifications between ancestor and child 2 as well.

24 questions
2
votes
1 answer

TFS: Branch, label or shelve?

I am pretty new to TFS but I have some experience with VSS. I like to know your opinions of what would be the best way of working with TFS in the following scenario: We are a group of developers working on projects. All projects starts from a common…
user628661
  • 81
  • 1
  • 1
  • 9
2
votes
1 answer

Programmatically make use of eclipse's merge and diff viewers

When a text conflict occurs in Bazaar (and many other dvcs) a .BASE, .THIS and .OTHER file is produced. Its then up to the user to make use of an 3 way merge tool to merge the conflict and then mark it as resolved. I would like to get hold of all…
Craig
  • 853
  • 1
  • 10
  • 17
2
votes
1 answer

3way Merge lib for .NET

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…
user34537
1
vote
0 answers

Use kdiff3 to "save a partial merge", leaving in (or adding?) unresolved conflict markers

The desired use-case might be: Launch KDiff3 via 'git mergetool' which auto-resolves most conflicts Resolve additional conflicts in KDiff3 Use a programming editor (eg. VS) to resolve remaining conflicts The title is a bit of a sinker as it's "No"…
user2864740
  • 60,010
  • 15
  • 145
  • 220
1
vote
1 answer

Git & ApartCI - How to verify code conflicts before inviting functional breakage?

Following Trunk Based Development, shown below: Assume there are two short-lived feature branches(f1 and f2) created from master(trunk). For implementation, source code files used for these branches overlap, in this scenario. Assume, there is one…
overexchange
  • 15,768
  • 30
  • 152
  • 347
1
vote
1 answer

Does git revert also use the 3-way-merge?

When I run git revert, it can happen, that a conflict occurs. Does git rely on the 3-way-merge, as it is depicted in the question merge internals (cf. table below) also for revert? What is the merge base for a revert? In What are the three files in…
white_gecko
  • 4,808
  • 4
  • 55
  • 76
1
vote
0 answers

Output of custom merge driver for Git

I want to use the custom merge driver for Git. To do this I wrote the program, which takes 5 arguments %O %A %B %L %Pas described here in the block "Defining a custom merge driver" and makes 3-way merge. %O - ancestor’s version %A - current brunch…
NAlmaz
  • 45
  • 4
0
votes
0 answers

The difference between "3 way Merge Sort" and "3 way Natural Merge Sort"

I am trying to learn all the merge sort algorithms. I tried to search the web for them but each page says something different and I want closure regarding those algorithms. Can anybody help?
AndreiSold
  • 25
  • 1
  • 6
0
votes
1 answer

Diff between 2 git commits except contained in 3rd commit

Is there a way to get meld + git to display changes that happened between 2 git commits, but exclude changes introduced in a 3rd commit? The use case is to see how much current commit differs from some commit done before a 3-way merge.
Dmitriusan
  • 11,525
  • 3
  • 38
  • 38
1
2