[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: What causes a conflict question

From: Jeff <jschneider_at_clrexec.com>
Date: Fri, 11 Feb 2011 13:07:04 -0800 (PST)

Thanks all for the suggestions

To make a correction - let me add some lines to my original post (unquoted)

> I'm sorry, I don't see this in the documentation or a prior post
>
> Say you have a file in the trunk with these 2 lines
>
> aa
> bb
>
> Developers Y and Z create new, separate branches from this.
>
> While developer Z is still working in their branch, developer Y commits the file into the trunk. it is now:
>
> aa qqqq
> bb
>
> Later, developer Z commits this file to their branch as follows:
>
> aa
> bb
> cc

Then developer Z switches to the trunk and merges in their revision. The option "Merge a Range of Revisions" is selected

>
> As I'm experiencing, the "qqqq" will be gone upon developer Z's commit. Despite the fact that developer Z never knew of the existence of the "qqqq" (nor deleted it), there is no conflict when developer Z makes a commit. It is the responsible of developer Z to ensure that they're not overwriting any thing that was committed to the file after the branch was created

> Is this correct?

Does anyone have any suggestions to avoid this? Another developer I work with said to choose "Reintegrate a branch", which a poster here said to avoid

>
> Thank you

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2703474

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-11 22:25:12 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.