RE: RE: How to switch branches without merging

Just check out main to a separate folder. This way you can have work in
progress on both versions at the same time and not have to worry about
conflicts when you do a switch. Personally, I discourage using switch
here.

BOb

-----Original Message-----
From: afroblanco [mailto:jeremypollack_at_gmail.com]
Sent: Friday, November 07, 2008 1:05 PM
To: users_at_tortoisesvn.tigris.org
Subject: RE: How to switch branches without merging

Well, that's just it. I want to be able to fix my main trunk WITHOUT
having
to check-in or revert the 1.3 branch that I'm currently working on. Is
there any way to do this?

Bob Archer wrote:
>
> I would always say that doing a switch if you have a dirty working
> directory is not a good idea. I think this is what you are asking.
Doing
> a switch does not do any merge at all.
>
> So, before you switch make sure to commit or revert your current
working
> dir. Then do your switch to your main. Make your changes and commit.
Now
> you can switch back to your 1.3 branch.
>

-- 
View this message in context:
http://www.nabble.com/How-to-switch-branches-without-merging-tp20385173p
20385863.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org