What causes a conflict question

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 the branch

aa
bb
cc

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?

Thank you

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-11 18:21:41 CET