How does 3-way merge actually work?

Collapse
X
 
  • Time
  • Show
Clear All
new posts
  • Dipti
    New User
    • Apr 2010
    • 2

    How does 3-way merge actually work?

    Hi,

    Could anyone just brief me how the 3-way merge in Beyond merge 3 actually work? Steps like which is considered as base file and based on which the merge actually happens etc.?
  • Aaron
    Team Scooter
    • Oct 2007
    • 16000

    #2
    Hello,

    The Center file is considered the Base / Ancestor. The Left and Right files are Yours and Theirs (which is which does not really matter as long as you keep it consistent). The bottom pane is the Output pane. By default, the Text Merge only shows two panes: Left and Right, and the Output pane. You need to open a middle file for the center pane to appear. It should look like this:
    http://www.scootersoftware.com/morei...shot=TextMerge
    Aaron P Scooter Software

    Comment

    Working...