Code. Versions SVN Branch to trunk Merge

1 to 7 of 7

  1.  
  1.  
    How do I do a merge from a branch to the trunk in Versions?

    Cheers :)
  2.  
    you can't as far as I know. You can either do it via terminal. Alternatively I use SmartSVN for merging.
  3.  
    The major negative point with Versions. Hopefully it will come soon.
  4.  

    This is a really good step by step guide to merging via terminal: http://www.sepcot.com/blog/2007/04/SVN-Merge-Branch-Trunk

  5.  
    Cheers Jordan.

    I reckon this is really crap. Is it not the main point of versions control?

    Trunk > branch
    Version/fix
    Merge to Trunk

    ???
  6.  
    yes it is pretty crap, but the rest is so pretty and easy, I can forgive that one shortcoming.
  7.  

    What milkboy said.

    It would be nice if there was a simple way of managing merging in Versions -- not to mention dealing with conflicts -- but I guess they had/have a good reason for not doing so (whether it's to keep the app simple, or for some other reason).

    I'd like to hear their thoughts on it though. In fact, I will tweet them now to find out.

1 to 7 of 7

  1.  
 
Sponsors: Digital Agency London