[gameprogrammer] Re: Tortoise SVN question
- From: Robbert de Groot <zekaric@xxxxxxxx>
- To: gameprogrammer@xxxxxxxxxxxxx
- Date: Tue, 11 May 2010 14:40:02 -0700 (PDT)
You want to "merge" down/up your changes. Each change will have a commit
number. Use that number (or multiple numbers) with the branch that you made
those changes to, to bring those changes into a different branch. With luck
you won't have merge conflicts.
Robbert de Groot
--- On Tue, 5/11/10, Kevin Jenkins <gameprogrammer@xxxxxxxxxx> wrote:
> With Tortoise SVN I made a branch off
> the trunk. I then made changes to the trunk that I want to
> pass to the branch. How do I do this? There are 3 options
> "Merage a range of revisoins", "Reintegrate a branch" and
> "Merge two different trees" and I'm not sure which one I
> want
---------------------
To unsubscribe go to http://gameprogrammer.com/mailinglist.html
Other related posts:
