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

Re: Merge question

From: Tyler Roscoe <tyler_at_cryptio.net>
Date: Thu, 4 Mar 2010 11:33:27 -0800

On Thu, Mar 04, 2010 at 02:29:33PM -0500, CoolBreeze wrote:
> Now having all production source code witin the Trunk and development within
> the Branches, if I'm working on the source of a particular sub-program
> within the Branches as well as another developer is working a different
> source file also under the same Branch, I've completed my work and am ready
> for my changes to be merged back into the Trunk. Is it possible to merge

This is a cherry-pick merge. Check out the Merge chapter of the book (or
wait for someone less lazy than me to link you to it).

tyler
Received on 2010-03-04 20:34:03 CET

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