Discussion Forum for StarTeam Users
Posted by EricT on January 25, 2001 at 09:17:00:
In Reply to: Re: How many views is too much? posted by Becky on January 25, 2001 at 05:42:12:
: What merge problems are you having? We also experience various merge oddities.
The merge problem is the following:
In the root view (called V1), create a file "X". Create a new branching view of V1 (called V2), make sure the the behavior of "X" is set to branch on change and its revision time is set to the time it was branched. In view V2, modify a single line of "X", check-in and merge V2 with V1 in order to make both files equals. After the merge, both views have exactly the same "X". Go again in V2 and modify again the exact same line you previously modified. Check in and merge again, and now you have a conflict on the line you have modified. This problem is due to the fact that the common parent is used in the three way merge where I would like Starteam to use the last version of X where it was made equal in both view.
Maybe this could be coded with the SDK? Anyone has experience with this?
Post a Followup