Results 1 to 2 of 2
  1. #1
    Join Date
    Jun 2013
    Posts
    3

    Default automerge always runs

    I have a source file on which I made a change on branch A.
    I need to copy the change to the same file on branch B, which is slightly different.
    I made the necessary changes, and now I want to review my code.

    I am running this command line:
    Code:
    BCompare.exe
    	branchA/filename-before-change
    	branchB/filename-before-change
    	branchA/filename-after-change
    	branchB/filename-after-change
    branchB/filename-after-change should be the result.
    When I run this command line, BC tries to merge the files and I lose the changes I've done. Can't it just open the files and let me decide which change to take at each line?

    thanks

    Roi

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

    Default

    BC3 does not have a 4 way comparison. The Text Compare supports 2 parameters in a 2 way compare, and the Text Merge supports a 3-way merge (4 parameters as 3 inputs and 1 output).
    http://www.scootersoftware.com/morei...ot=TextCompare
    http://www.scootersoftware.com/morei...shot=TextMerge


    We have an article about a strategy to deploy changes like this here:
    http://www.scootersoftware.com/suppo...arallelupdates

    To compare the results, you would need to perform it in pairs in the Text Compare. If using the 3-way Text Merge, the center pane should be a common Ancestor to the Left and Right inputs. The bottom pane is always the output file. As an output, it is a target and not part of the comparison. The contents of the file are not loaded, only used as a save target.

    Please let us know if you have any questions.
    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
  •