From: Suvayu Ali <fatkasuvayu+linux@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: advice needed: how do you guys sync org files between devices?
Date: Tue, 2 Jul 2013 12:17:23 +0200 [thread overview]
Message-ID: <20130702101723.GA26752@kuru.dyndns-at-home.com> (raw)
In-Reply-To: <CAJMNdQ+K=HEfj0L7H2kOYD00Q8X=2w9mMMK_51Tti-0+MMWAvQ@mail.gmail.com>
Hello,
On Mon, Jul 01, 2013 at 01:25:26PM -0300, Tomas Grigera wrote:
> On Mon, Jul 1, 2013 at 1:10 PM, Brian van den Broek <
> brian.van.den.broek@gmail.com> wrote:
> >
> > bzr and hg are (superficially?) easier and git is pretty dominant.
[...chomp...chomp...chomp...]
> But I agree with Brian that in the long run, though harder to learn, git is
> a charm.
A comment about using git:
I have noticed that git *always* conflicts with TODO state changes. It
seems changes to a headline is not easy to resolve. This is where the
Org merge tool would be perfect. There was a GSoC project[1], but I
have not tested the end result. As far as I recall, although
functional, it was not complete.
Please do not take this as a vote against using git, I use it myself and
I'm a big git enthusiast (as many on the list know by now :-p).
Cheers,
Footnotes:
[1] <http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/>
--
Suvayu
Open source is the future. It sets us free.
next prev parent reply other threads:[~2013-07-02 10:17 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-01 12:06 advice needed: how do you guys sync org files between devices? Xebar Saram
2013-07-01 16:10 ` Brian van den Broek
2013-07-01 16:25 ` Tomas Grigera
2013-07-01 18:02 ` Karl Voit
2013-07-02 7:40 ` Alan Schmitt
2013-07-02 8:03 ` Karl Voit
2013-07-02 9:06 ` Rasmus
2013-07-02 9:43 ` Myles English
2013-07-02 13:36 ` Alan Schmitt
2013-07-02 14:07 ` Rasmus
2013-07-02 14:27 ` Alan Schmitt
2013-07-02 16:03 ` Suvayu Ali
2013-07-04 8:26 ` Alan Schmitt
2013-07-02 15:50 ` Brett Viren
2013-07-03 21:48 ` Julien Cubizolles
2013-07-02 10:17 ` Suvayu Ali [this message]
2013-07-02 12:30 ` Xebar Saram
2013-07-02 16:59 ` Juan G.
2013-07-02 15:59 ` David Engster
2013-07-02 16:08 ` Suvayu Ali
2013-07-02 16:11 ` David Engster
2013-07-02 16:51 ` Suvayu Ali
2013-07-01 16:31 ` Ramon Diaz-Uriarte
2013-07-02 19:49 ` Simon Thum
2013-07-03 8:17 ` Samuel Loury
2013-07-03 17:33 ` G. Martin Butz
2013-07-03 20:05 ` Nick Dokos
2013-07-04 8:28 ` Ian Barton
2013-07-04 8:57 ` Nicolas Richard
2013-07-08 15:53 ` Christopher Allan Webber
2013-07-08 21:41 ` Xebar Saram
2013-07-09 8:26 ` Rasmus
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=20130702101723.GA26752@kuru.dyndns-at-home.com \
--to=fatkasuvayu+linux@gmail.com \
--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).