Re: org changes lost

[Chong Yidong]

Carsten Dominik <address@hidden> writes:

>> Hmm maybe there should be a standard text that gets sent out to new
>> committers, which includes things like "never, ever, simply upload the
>> newest version of your local sources; always merge."...
>
> My skills in version control my not be sufficient to do this, jumping
> between different version control worlds.  So I work by applying
> changed in Emacs to my local copy and reserve the right to undo
> changes made in Emacs (not that this has been necessary recently).
> Usually this works OK, occasionally, like yesterday, I miss something.

Why don't you just use `cvs update' to merge in changes?