Merge question

2010-03-04 Thread CoolBreeze
I'm getting back into using Subversion and I'm not sure how to answer a question a co-worker asked me regarding merging. Can someone please explain how the following is handled with the following repository structure of our ASP.NET Intranet site? Our repository is structured below: IntranetSite

Re: Merge question

2010-03-05 Thread CoolBreeze
0:22 AM, Tyler wrote: > I am not the list. > > On Fri, Mar 05, 2010 at 08:45:59AM -0500, CoolBreeze wrote: > > Ok after having a few more discussions here's a situation that we face > > frequently. > > > > Lets say Bob is working on Trunk\ProjectX\File1 and John

Re: Merge question

2010-03-05 Thread CoolBreeze
Thanks Bob. I'm trying to get an understanding of how Merge works. I was actually thinking in the case I presented that Bob actually shouldn't be checking his unfinished work into the Trunk until it is finished as you stated and that he should create a Tag to use until it is. Anyway thanks for the

Re: Merge question

2010-03-05 Thread CoolBreeze
Again thank you. On Fri, Mar 5, 2010 at 1:47 PM, Bob Archer wrote: > Probably a branch rather than a tag. Generally by convention you don't > want to commit to tags. > > > > BOb > > > > > > *From:* CoolBreeze [mailto:coolbreeze...@googlemail.com] >