From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric S Fraga Subject: Re: org-caldav feedback Date: Thu, 24 Jan 2013 11:08:58 +1030 Message-ID: <87a9rzmn31.fsf@ucl.ac.uk> References: <87wqvb1vh4.fsf@engster.org> <87obgi2v9t.fsf@engster.org> <87fw1u2pdp.fsf@engster.org> <87boch2dik.fsf@engster.org> <8738xsa16n.fsf@ucl.ac.uk> <87622ny7fq.fsf@engster.org> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:56691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyApb-0006j8-Im for emacs-orgmode@gnu.org; Wed, 23 Jan 2013 19:38:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TyApa-0003av-6p for emacs-orgmode@gnu.org; Wed, 23 Jan 2013 19:38:15 -0500 Received: from ch1ehsobe002.messaging.microsoft.com ([216.32.181.182]:17098 helo=ch1outboundpool.messaging.microsoft.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyApa-0003ai-1y for emacs-orgmode@gnu.org; Wed, 23 Jan 2013 19:38:14 -0500 Received: from mail63-ch1 (localhost [127.0.0.1]) by mail63-ch1-R.bigfish.com (Postfix) with ESMTP id C42DD4A01C3 for ; Thu, 24 Jan 2013 00:38:12 +0000 (UTC) Received: from CH1EHSMHS011.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.247]) by mail63-ch1.bigfish.com (Postfix) with ESMTP id 40E193000C4 for ; Thu, 24 Jan 2013 00:38:10 +0000 (UTC) In-Reply-To: <87622ny7fq.fsf@engster.org> (David Engster's message of "Wed, 23 Jan 2013 21:23:53 +0100") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org Mode Mailing List David Engster 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