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

Re: Merging from different branches

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Tue, 18 Mar 2008 17:01:00 -0700

CircusMan wrote:
> Here is the deal. We have about 4 to 5 different branches. Right now
> i'm trying to merge two branches together. We have one file lets
> call X. X was created in our first branch. About a month ago I
> merged this into our second branch and X was added to this branch. We
> had problems and I need to re-merge everything back into the second
> branch from the first. When I do this though X is being showed as
> being Added AGAIN. But it was already added the first time, why is it
> getting added again? Will there be now two versions of this form?

This question belongs on the users_at_subversion.tigris.org list, as it is not
related to the development of Subversion itself.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-03-19 01:01:11 CET

This is an archived mail posted to the Subversion Dev mailing list.