Thanks for the post Quinn, I am however completely lost! I have a Branch 'sandbox' which is sitting at revision 251 and the trunk (which has has a couple of changes since checkout of sandbox) is 247, any help on this would be great, did manage to run a diff via terminal, but still completely lost...
On May 12, 5:27 pm, Quinn Taylor <[email protected]> wrote: > From Terminal, you'll want to look at using `svn merge -- > reintegrate ...` — you can find more detail by typing `svn help > merge`. This assumes you're using SVN 1.5+. Also check out the SVN > book parts on merging.http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html > > - Quinn > > On May 12, 2010, at 8:44 AM, james wrote: > > > > > Ok so I have read a lo about how merge isn't (yet) within Version, but > > I have created a brach from the main trunk which i'm using as a > > sandbox, to check and develop a site with, then once happy I wanted to > > drop everything onto the trunk. Seeing as this is not with-in versions > > how can I go about getting this done? > > > -- > > You received this message because you are subscribed to the Google > > Groups "Versions" group. > > To post to this group, send email to [email protected]. > > To unsubscribe from this group, send email to > > [email protected] > > . > > For more options, visit this group > > athttp://groups.google.com/group/versions?hl=en > > . > > > > smime.p7s > 8KViewDownload -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
