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

Re: Merge - I only want my changes merged

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 22 Dec 2011 21:58:54 +0100

On 22.12.2011 21:53, Carlos Tijerina wrote:
> 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?

No, of course not.
You're working on the same project, so a merge picks up changes in the
project. There's no merging based on author.
You have to select the individual revisions to merge manually if you
don't want changes merged in from others.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2899202
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-22 21:59:02 CET

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