Re: What causes a conflict question

> 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
>
Well you said developer Z was committing to the branch, not the trunk,
so Z's actions should not effect the trunk at all. The branches and
trunk should be 100% seperate until someone goes and merges across.

If you mean they both commit to the trunk later, generally what happens
is that when the 2nd party goes to commit changes, SVN will fail and
tell you you need to update first. You cannot commit until you have
checked out the latest copy. When you go and update it, conflicting
lines should create a "conflict", which you will then need to "resolve"
before you will be permitted to commit. Generally speaking if you do
everything correctly you will not overwite other people's changes unless
you meant to do that when you manually did it in the conflict resolution
stage (which is almost always managed by the user, unless tortoises
merge cannot figure out what your external merge program later could do
automatically).

I hope that helps.

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

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