Re: Accidentally merged out code.

[Laine Stump]

"Alexander Kamilewicz" <address@hidden> writes:

> Andy Bradford wrote:
> > 
> > Thus said "Alexander Kamilewicz" on Wed, 28 Mar 2001 10:24:34 CST:
> > 
> > > > Usually this is caused by someone doing an update while they have a file
> > > > loaded into a text editor and then saving the file over top of the
> > > > merged version (wiping out the merged changes) and then committing it.
> > >
> > > LOL!!!  That's pretty clever.  I hope my developers don't find out about
> > > that....
> > 
> > While it might be clever, it is certainly a nightmare when trying to
> > figure out why their code disappeared.  Then, try explaining to them
> > that this is not the correct way to use it. :-)
> 
> That's why I've got this large baseball bat here....  :)

And fortunately most text editors (at least the ones I use, ie emacs
and MS Visual Studio) are smart enough to notice when this happens,
and at least give a warning before overwriting the updated copy.