[TxMt] Subversion and Merging?

[Eric Coleman]

I've read, and reread the svn book on branch / merging...

And I still don't understand what im supposed to do.  I think I do this:

1) SVN Copy trunk to the new branch
2) checkout the branch, remove all files
3) put new files into branch, commit, etc
4) Delete files in trunk, merge branch to trunk

I somehow don't think that's right, but I honestly am not sure.

Eric Coleman


On May 1, 2006, at 1:59 PM, Aparajita Fishman wrote:

>> I know this doesn't belong here, but Im looking for some quick  
>> information:
>>
>> Now, when I'm finished with the 1.1 branch, how do I merge it into  
>> trunk?
>
> Read the SVN book, it covers this topic thoroughly.
>
> http://svnbook.red-bean.com/
>
> Regards,
>
>    Aparajita
>    www.aparajitaworld.com
>
>    "If you dare to fail, you are bound to succeed."
>    - Sri Chinmoy   |   www.srichinmoylibrary.com
>
>
>
> ______________________________________________________________________
> For new threads USE THIS: textmate at lists.macromates.com
> (threading gets destroyed and the universe will collapse if you don't)
> http://lists.macromates.com/mailman/listinfo/textmate

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3696 bytes
Desc: not available
URL: <http://lists.macromates.com/textmate/attachments/20060502/d76d11d2/attachment.p7s>