David Engster <d...@randomsample.de> writes: > Eric S. Fraga writes: >> I've had to clear out the org-caldav-xxx.el file in .emacs.d a couple >> of times but that's typically due to my doing things on the same entry >> in both calendar systems (org and Google). > > If you change an item in Org as well as in the Calendar, the calendar > entry should simply get overwritten with the change you did in Org. So > while this "Org always wins" strategy doesn't qualify as proper conflict > handling, I still wonder why you had to restart from scratch?
Who knows? I was mucking about quite a bit and I obviously confused the system! As I said, no worries as the fix was straightforward. > Anyway, this is a temporary issue; I will add proper conflict handling > in the coming weeks. I look forward to it! Thanks, eric -- : Eric S Fraga, GnuPG: 0xC89193D8FFFCF67D : in Emacs 24.3.50.1 and Org release_7.9.3d-837-ge37613