emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: David Engster <deng@randomsample.de>
To: Org Mode Mailing List <emacs-orgmode@gnu.org>
Subject: Re: org-caldav feedback
Date: Wed, 23 Jan 2013 21:23:53 +0100	[thread overview]
Message-ID: <87622ny7fq.fsf@engster.org> (raw)
In-Reply-To: <8738xsa16n.fsf@ucl.ac.uk> (Eric S. Fraga's message of "Wed, 23 Jan 2013 16:30:32 +1030")

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?

Anyway, this is a temporary issue; I will add proper conflict handling
in the coming weeks.

-David

  parent reply	other threads:[~2013-01-23 20:24 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-17 15:32 org-caldav feedback Torsten Wagner
2013-01-17 19:05 ` David Engster
2013-01-17 21:28   ` Torsten Wagner
2013-01-21 19:29     ` David Engster
2013-01-21 16:28   ` Torsten Wagner
2013-01-21 19:25     ` David Engster
2013-01-21 19:37       ` Torsten Wagner
2013-01-21 21:32         ` David Engster
2013-01-22 15:35           ` Torsten Wagner
2013-01-22 20:01             ` David Engster
2013-01-23  6:00               ` Eric S Fraga
2013-01-23 14:22                 ` Torsten Wagner
2013-01-23 20:11                   ` David Engster
2013-01-24  0:37                   ` Eric S Fraga
2013-01-23 20:23                 ` David Engster [this message]
2013-01-24  0:38                   ` Eric S Fraga
2013-01-23 14:38               ` Torsten Wagner
2013-01-23 20:16                 ` David Engster
2013-02-02 16:00                 ` David Engster
2013-03-01 15:37                   ` Torsten Wagner
2013-03-02 14:08                     ` David Engster
2013-01-18  3:47 ` Eric S Fraga
2013-01-21  9:38 ` Christian Egli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87622ny7fq.fsf@engster.org \
    --to=deng@randomsample.de \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).