RE: What causes a conflict question

-----Original Message-----
From: Jeff [mailto:jschneider_at_clrexec.com]
Sent: Friday, February 11, 2011 11:11 AM
To: users_at_tortoisesvn.tigris.org
Subject: 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

------------------------------------------------------

I assume you mean that developer Z committed their changes to the branch, and then merged their branch back to trunk.
When you looked at the file on trunk, developer's Y changes were missing.

Sounds like developer Z used the "reintegrate" option when they did the merge and shouldn't have.

The "reintegrate" option should only be used when merging a branch back to the trunk IF the branch has been updated and already includes any additional changes that might be present on trunk. If the reintegrate option is used and this has not be done, then the merge will result in changes be "lost" or undone that exist on trunk but did not exist in the developer's branch.
In this case, only a regular merge should have been performed, and the changes from both developers would be present on trunk.

Hope this helps!

-----Message Disclaimer-----

This e-mail message is intended only for the use of the individual or
entity to which it is addressed, and may contain information that is
privileged, confidential and exempt from disclosure under applicable law.
If you are not the intended recipient, any dissemination, distribution or
copying of this communication is strictly prohibited. If you have
received this communication in error, please notify us immediately by
reply email to Connect_at_principal.com and delete or destroy all copies of
the original message and attachments thereto. Email sent to or from the
Principal Financial Group or any of its member companies may be retained
as required by law or regulation.

Nothing in this message is intended to constitute an Electronic signature
for purposes of the Uniform Electronic Transactions Act (UETA) or the
Electronic Signatures in Global and National Commerce Act ("E-Sign")
unless a specific statement to the contrary is included in this message.

While this communication may be used to promote or market a transaction
or an idea that is discussed in the publication, it is intended to provide
general information about the subject matter covered and is provided with
the understanding that The Principal is not rendering legal, accounting,
or tax advice. It is not a marketed opinion and may not be used to avoid
penalties under the Internal Revenue Code. You should consult with
appropriate counsel or other advisors on all matters pertaining to legal,
tax, or accounting obligations and requirements.

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

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