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

RE: Re: Merge - I only want my changes merged

From: Carlos Tijerina <carlos.f.tijerina_at_jpmchase.com>
Date: Thu, 22 Dec 2011 12:53:41 -0800 (PST)

ok, Developer A has file-1 on his local machine. Developer B has file-32 on his machine. When Developer B checks in file 32, he merges to Trunk.
When Developer A tries to merge file-1 to Trunk, it also wants to Merge Developer B file-32. Each developer has his own ID and the Merge should pick up changes related to only his ID, not other developers changes. right?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-22 21:57:17 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.