Use your SourceSafe administration tool , go to Tools->options->General, allow multiple check outs, problem solved. It will then allow you to merge in your changes.
Keith > -----Original Message----- > From: xperroni [mailto:[EMAIL PROTECTED] > Sent: Thursday, 2 December 2004 9:14 a.m. > To: [EMAIL PROTECTED] > Subject: [XP] Code management practices > > > > > Hello all, > > My development team and I have recently ran into a problem > with our set of development (JDeveloper) and version > management (MS Source > Safe) tools. It's become frequent the situation where two > programmers must have write access to the same file; however, > Source Safe's approach to code management is to never let > more than one user write to anything at the same time. > > The approach advogated by XP -- let everyone write to files > and then solve conflicts at code releasing time -- seemed a > good solution. In eXtreme Programming Installed there is a > very interesting description of a code management policy, but > it is admitedly a simplified explanation. What references > (specific or not) you recommend on the subject of code > management? Are there any commentaries or personal experience > you'd want to share? > > -- > Helio > > > > > > > > > > To Post a message, send it to: [EMAIL PROTECTED] > > To Unsubscribe, send a blank message to: > [EMAIL PROTECTED] > > ad-free courtesy of objectmentor.com > Yahoo! Groups Links > > > > > > > > To Post a message, send it to: [EMAIL PROTECTED] To Unsubscribe, send a blank message to: [EMAIL PROTECTED] ad-free courtesy of objectmentor.com Yahoo! Groups Links <*> To visit your group on the web, go to: http://groups.yahoo.com/group/extremeprogramming/ <*> To unsubscribe from this group, send an email to: [EMAIL PROTECTED] <*> Your use of Yahoo! Groups is subject to: http://docs.yahoo.com/info/terms/
