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

Re: Need to merge changes, best practices?

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-03-07 15:20:10 CET

On 3/7/07, Raterus <raterus@hotmail.com> wrote:
> About 4 months ago, I took a project on a live site and imported it into subversion for the first time. I've been making my changes there, preparing for an eventual deployment (my changes are not yet on the live site)
> Unfortunately another developer has just been changing the live site. He's told me the exact files he's changed, but I'd like to use TortoiseSVN to easily merge his changes into mine. Does anyone know of an easy way to do this, using TortoiseSVN.
> Basically what I have is my local copy of my changes. The live site and list of files he's modified, and TortoiseSVN.

Before you do anything else, lock the other developer out of the live site.

If you know what he's changed relative to the repository, check out a
new WC, then copy into it the contents of the live site. Commit that,
then update your current WC.

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Mar 7 15:20:28 2007

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.