Results 1 to 4 of 4
  1. #1
    Join Date
    Aug 2012
    Posts
    2

    Default Expected Merge Behavior

    Ideally (for me) when doing a 3-way merge, beyond compare would take changes from the base revision on the trunk, and changes from the base revision on the branch, and mark a conflict if a section changed in both(and wasn't the same).

    Instead I see that it normally favors the right, and (IMO) oddly if the changes occurred in both the trunk and the branch, selects the base (in that case I would expect it to select the branch or the trunk...it doesn't matter).

    I would expect this would be the way people would normally like to work. Am I missing something? Is there an option to make it work that way?

  2. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,375

    Default

    Hello,

    BC3 does not favor a side by default, but this can be enabled in the Text Merge's View menu -> Favor Right or Favor Left. Is Favor Right toggled on for you? If you disable it, does the merge behave more like you expect?
    Aaron P Scooter Software

  3. #3
    Join Date
    Aug 2012
    Posts
    2

    Default

    I figured it out...I was using tortoisesvn and the order it passed files to beyond compare wasn't what beyond compare expected. Thanks.

  4. #4
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,375

    Default

    You will want to use the configuration found here:
    http://www.scootersoftware.com/suppo...cs#tortoisesvn
    Aaron P Scooter Software

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •