Re: recent changes to org files

[Carsten Dominik]

> To me the rule goes as follows: I only install patches, not files.
> That usually takes core of those problems: if the author's version  
> disagrees
> with the CVS version I get a conflict when I try to apply the patch.


To me it works like this:  My copy is the master copy, not the one in  
Emacs.  The best
setup for me would be to get email notifications, maybe with a patch,  
whenever some
Emacs developer touches my files in Emacs.  Then I can decide if I  
agree with these
changes and incorporate the accepted part into my master copy.

- Carsten