emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Suvayu Ali <fatkasuvayu+linux@gmail.com>
To: Alan Schmitt <alan.schmitt@polytechnique.org>
Cc: emacs-orgmode@gnu.org
Subject: Re: [SYNC] How do you sync your org-mode files between n devices (n > 2)
Date: Thu, 5 Sep 2013 11:42:34 +0200	[thread overview]
Message-ID: <20130905094234.GH19491@kuru.dyndns-at-home.com> (raw)
In-Reply-To: <m2li3bk5yt.fsf@polytechnique.org>

Hi Alan,

On Thu, Sep 05, 2013 at 10:50:18AM +0200, Alan Schmitt wrote:
> fatkasuvayu+linux@gmail.com writes:
> 
> > I think the issue with tools like Unison, Dropbox, is conflict
> > resolution on simultaneous edits.  Traditional version control does a
> > better job of that, but then it loses the convenience of these other
> > tools.
> >
> > I believe there is a list member (Alan) close to Unison development; in
> > the thread referenced by Samuel there is some discussion on how this
> > could be done in a more well defined manner.
> 
> Unison can call external tools to merge conflicting files. If someone
> wants to use such a tool with unison, I can definitely give a hand.

If you can find the time, I have a somewhat more involved proposal for
you :).

I think this would be a wonderful addition to Worg.  Probably the FAQ is
more appropriate (under "Tips and Tricks") since this is one of most
commonly asked questions on the list.  On the other hand, if you think
covering this topic requires more than just a few lines, a longer entry
or short article in the config section would be more appropriate.

Cheers,

-- 
Suvayu

Open source is the future. It sets us free.

  reply	other threads:[~2013-09-05  9:42 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-03 21:34 [SYNC] How do you sync your org-mode files between n devices (n > 2) noreply
2013-09-04  6:04 ` Suvayu Ali
2013-09-04  6:30   ` Xiao-Yong Jin
2013-09-04  7:43     ` Suvayu Ali
2013-09-04  8:00       ` Torsten Wagner
2013-09-05  8:50       ` Alan Schmitt
2013-09-05  9:42         ` Suvayu Ali [this message]
2013-09-05 10:00           ` Alan Schmitt
2013-09-05 10:26             ` Karl Voit
2013-09-05 11:42               ` Jonas Hörsch
2013-09-05 13:03                 ` [SYNC] How do you sync your org-mode files between ndevices (n > 2)) Alan Schmitt
2013-09-05 11:25             ` [SYNC] How do you sync your org-mode files between n devices (n > 2) Suvayu Ali
2013-09-05 12:31               ` Alan Schmitt
2013-09-05 12:54                 ` Suvayu Ali
2013-09-05 13:24                   ` Alan Schmitt
2013-09-05 16:14                 ` [SYNC] How do you sync your org-mode files between ndevices (n > 2)) Ramon Diaz-Uriarte
2013-09-05 13:37             ` [SYNC] How do you sync your org-mode files between n devices (n > 2) Robert Horn
2013-09-04  6:21 ` Jambunathan K
2013-09-04  6:47 ` Paul Rudin
2013-09-04  6:50 ` Samuel Loury
2013-09-05 20:00 ` Marc Ihm

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=20130905094234.GH19491@kuru.dyndns-at-home.com \
    --to=fatkasuvayu+linux@gmail.com \
    --cc=alan.schmitt@polytechnique.org \
    --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).