Re: What causes a conflict question

On Feb 12, 2:07 am, Jeff <jschnei..._at_clrexec.com> wrote:

> 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.

You are slightly wrong. On merging Z-branch to trunk merge-conflict
(AFAIR) will be raised and 3-way manual merge will appear (common
parent-current trunk-current branch )

BTW, you can try to explore history of edits-merges in my sandbox-repo
http://dev.dics.com.ru:8088/svn/Hello/ (it _may_ have smth.
interesting for you workflow, can't recall old times)

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-12 07:58:57 CET