Merging individual files in a 3-way folder comparison

Collapse
X
 
  • Time
  • Show
Clear All
new posts
  • MBaas
    Journeyman
    • Jul 2005
    • 16

    Merging individual files in a 3-way folder comparison

    Hi,

    I'm doing a 3-way-folder comparison (merging A+B into C) and I typically select entire files from the folder-comparison and move them into the merge-dir. But sometimes I need to look at a file individually and merge it from both sources. When opening the file-comparison in such a context, it also shows the 3 files, but the merge-window below the screen is set to "Merge to: Other"with an empty input-field. Can you add a "Center"-option there?

    Thanks

    Michael
  • Aaron
    Team Scooter
    • Oct 2007
    • 15997

    #2
    Hello,

    Center, by design, should be the common ancestor of the left and right. "Yours" and "Theirs" would then be the Left and Right sides, which is why we merge into these targets instead. If C is your target, I'd recommend making it the Left or Right side, and then put the older version (A or B?) into the Center, whichever is the common ancestor of C and the other.
    Aaron P Scooter Software

    Comment

    Working...