Re: Re: Need information on tree conflicts
From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Tue, 19 May 2009 22:08:58 +0100
2009/5/18 Chuck Holzwarth <chuck_holzwarth_at_yahoo.com>:
No, exactly the same.
> For textual conflicts:
Your description with "branch" and "other branch" is a little
> What we are experiencing is that a directory does not exist in either branch to start with. ProgrammerA creates the directory in brancA. Programmer creates a direcotry with the same name and in the same point in the hierarchy in branchB. Files are added to the directories on both branches. branchA is merged to a release branch and checked in. The release goes to production and the release branch is merged to the trunk. A new release branch is created as a copy of the trunk. When we try to merge branchB to the new release branch, we get a tree conflict for the directory. For our part, we are choosing to keep the directory object from the trunk as the master object since other subsequently created branches will be using that object.
Well of course everything comes from the repository in one sense -
Local directory = working copy = trunk
-- : ___ : oo // \\ "De Chelonian Mobile" : (_,\/ \_/ \ TortoiseSVN : \ \_/_\_/> The coolest Interface to (Sub)Version Control : /_/ \_\ http://tortoisesvn.net ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2319439 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].Received on 2009-05-19 23:09:11 CEST
This is an archived mail posted to the TortoiseSVN Users mailing list.