Results 1 to 3 of 3
  1. #1
    Join Date
    May 2011
    Posts
    9

    Default What's a correct startegy to apply 3Way merge

    Hi,

    I have issues to define a correct strategy for merging branches of a development project.

    I have a Trunk from which I have created 2 branches A and B.
    Everyday, I do a merge of A onto the Trunk and next of B onto the Trunk.
    But I don't merge the Trunk back on A and B! Changes done on A are therefore not reflected on B and vice-versa.

    I have automated those "merge" using the 3way merge of BC3 in a batch where the Trunk of the previous day is used as an ancestor (a.k.a the Trunk -1).

    I think now that using the Trunk "-1" is most probably an error. Shouldn't I do keep the original Trunk as an ancestor for any new daily merge? Or should I use a specific ancestor per branche, such as the A "-1" as an ancestor for the merge of A onto the Trunk and B "-1" as an ancestor for the merge of B onto the Trunk ?

    Thx a lot in advance for your recommendation.

    V.

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

    Default

    Hello,

    You will want to have A-1 as your ancestor, and A and Trunk as your Left and Right sides. You can then favor the Trunk to accept those changes when not conflicts.

    The command line would be:
    bcomp A Trunk A-1 /favorright

    Does that show the results you expect?
    Aaron P Scooter Software

  3. #3
    Join Date
    May 2011
    Posts
    9

    Default

    Thanx a lot ! after testing, it's indeed perfect.

    V.

Posting Permissions

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