Re: Tree conflict on Fresh checkout

2013-06-05 Thread Shahid khan
On Jun 5, 2013 5:13 PM, "James Hanley" wrote: > I'm using Google Apps Mail... but I think I've set it to plain-text. > > user_dude@computer_node ~/projects/my_project/my_project_03b_pristine > $ svn ls -v Project/settings | grep -i mkimage >2528 cm_user May 30 19:28 MkImage/ >

Re: Merging change sets for a production release,

2013-06-03 Thread Shahid khan
On Jun 3, 2013 12:27 PM, "Gavin Baumanis" wrote: > > Hi Everyone, > > At the moment we do all of our work on /trunk and also have /branches/releases/1.0 > When we have enough issues, we mark the ready / required issues with a new release milestone and I go about the task of merging the required ch