[cvsnt] newbie question......

[Alexandre Augusto Drummond Barroso]

> -----Original Message-----
> From: keith d. zimmerman [mailto:lists at kdz13.net]
> Sent: Thursday, September 25, 2003 3:35 PM
> To: 'Pitre, Russell'; cvsnt at cvsnt.org
> Subject: RE: [cvsnt] newbie question......
> 
> > -----Original Message-----
> > From: cvsnt-bounces at cvsnt.org 
> > [mailto:cvsnt-bounces at cvsnt.org] On Behalf Of Pitre, Russell
> > Sent: Thursday, September 25, 2003 1:46 PM
> > To: cvsnt at cvsnt.org
> > Subject: [cvsnt] newbie question......
> > 
> > Hello all
> 
> Hello
> 
> > My question is, how does a project team go about working on the same
> > file in a project without running into conflicts?  Is it a 
> > simple matter
> > of verbal communication?  Hey friend, I'm working on 
> welcome.html I'll
> > let you know when I'm done so you can work on it?
> > 
> 
> It'll be a combination of verbal/non-verbal communication and dumb
> luck...  The conflict only arises when you actually make 
> changes to the
> same lines of html/code.  I've found that with good 
> management of who is
> doing what, this happens rarely in practice.  In other words, if you
> have one "task" to change the title of the page, and another "task" to
> change the footer, and you do the one, and your friend does the other,
> cvs will automaticly merge your changes.  The assignment of who does
> what is the communication part.  It would be stupid for both of you to
> be responsible for changing the title, would it not?
> 

But if you really need to change the same portion of html/code your 
workmate was assigned to work on, you don't need to tell your workmate 
you're done since he/she will certainly be using "watches" that will 
notify him/her as soon as you commit your changes.
When you use reserved edits, you will know if somebody is editing the 
file so you can decide if you will set a watch and wait your workmate 
stop editing the file or just edit the file ans use CVS Conflict Editor 
(http://sourceforge.net/projects/conflicteditor).


[snip]
> keith d. zimmerman, mcsd 
> eagle solutions

Zandall