[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Accidentally merged out code.
From: |
Laine Stump |
Subject: |
Re: Accidentally merged out code. |
Date: |
29 Mar 2001 11:22:44 -0500 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) Emacs/20.7 |
"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.
- Accidentally merged out code., Andy Bradford, 2001/03/27
- Re: Accidentally merged out code., Alexander Kamilewicz, 2001/03/28
- Re: Accidentally merged out code., Andy Bradford, 2001/03/28
- Re: Accidentally merged out code., Alexander Kamilewicz, 2001/03/29
- Re: Accidentally merged out code.,
Laine Stump <=
- cvswrappers - any better suggestions ?, Gianni Mariani, 2001/03/29
- Re: cvswrappers - any better suggestions ?, Rob Helmer, 2001/03/29
- RE: cvswrappers - any better suggestions ?, Gianni Mariani, 2001/03/30
- RE: cvswrappers - any better suggestions ?, Greg A. Woods, 2001/03/30
- RE: cvswrappers - any better suggestions ?, Gianni Mariani, 2001/03/30
- RE: cvswrappers - any better suggestions ?, Greg A. Woods, 2001/03/30
- RE: cvswrappers - any better suggestions ?, Gianni Mariani, 2001/03/31
- RE: cvswrappers - any better suggestions ?, David Glick, 2001/03/31
- RE: cvswrappers - any better suggestions ?, Greg A. Woods, 2001/03/31
- Re: cvswrappers - any better suggestions ?, Eric Siegerman, 2001/03/29