From mboxrd@z Thu Jan  1 00:00:00 1970
From: Josh Berry <taeric@gmail.com>
Subject: Re: Advice needed: Cant find a decent way to autosync my work TODO
 org file between laptop and work pc
Date: Sun, 25 May 2014 08:13:57 -0400
Message-ID: <CAG9v9Nmef58Xn-RSgSTACG+R8xfyhmE=0QJTOtWhbqNWzjnpPA@mail.gmail.com>
References: <CAOQHXPoxvoFd4VcFXdARZnhYH4eELca+S-m8bj9eCRz=8vG68g@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/alternative; boundary=001a11c12766df6c6b04fa3866b9
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34402)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <taeric@gmail.com>) id 1WoXJj-0005Ok-Iq
	for emacs-orgmode@gnu.org; Sun, 25 May 2014 08:14:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <taeric@gmail.com>) id 1WoXJi-0003uJ-Mg
	for emacs-orgmode@gnu.org; Sun, 25 May 2014 08:14:19 -0400
Received: from mail-qg0-x22d.google.com ([2607:f8b0:400d:c04::22d]:55856)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <taeric@gmail.com>) id 1WoXJi-0003tL-Ic
	for emacs-orgmode@gnu.org; Sun, 25 May 2014 08:14:18 -0400
Received: by mail-qg0-f45.google.com with SMTP id z60so10390690qgd.4
	for <emacs-orgmode@gnu.org>; Sun, 25 May 2014 05:14:17 -0700 (PDT)
In-Reply-To: <CAOQHXPoxvoFd4VcFXdARZnhYH4eELca+S-m8bj9eCRz=8vG68g@mail.gmail.com>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: Xebar Saram <zeltakc@gmail.com>
Cc: org mode <emacs-orgmode@gnu.org>

--001a11c12766df6c6b04fa3866b9
Content-Type: text/plain; charset=UTF-8

On Sat, May 24, 2014 at 1:11 AM, Xebar Saram <zeltakc@gmail.com> wrote:

>  need to sync my main work TODO org file between my work PC and laptop i
> carry around on work related trips and when im at home. i have tried
> several methods buy really none of them work.
>
> i mainly used git over the last 6 months but that forces me to
> pull/commit/push manually each time i add something to either machine and
> that is really annoying. plus i get merge conflicts all the time
>

I can't really help for the other items too easily, but have you tried
*not* syncing edits between a single files?  This would at least stop the
merge conflicts.

That is, if you had two sets of all of your .org files, one under
"desktop/" and the other under "laptop/", then you could setup a basic hook
in git that pushes/pulls on every change.  I believe org is good with the
refile commands that moving between the flies shouldn't be that much of a
burden, if you do that often.  Otherwise, things definitely work well for
agenda mode and such.

-josh

--001a11c12766df6c6b04fa3866b9
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><br><div class=3D"gmail_extra"><br><br><div class=3D"gmail=
_quote">On Sat, May 24, 2014 at 1:11 AM, Xebar Saram <span dir=3D"ltr">&lt;=
<a href=3D"mailto:zeltakc@gmail.com" target=3D"_blank">zeltakc@gmail.com</a=
>&gt;</span> wrote:<br>

<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
x #ccc solid;padding-left:1ex"><div dir=3D"ltr">=C2=A0need to sync my main =
work <span>TODO</span> org file between my work PC and laptop i carry aroun=
d on work related trips and when <span>im</span> at home. i have tried seve=
ral methods buy really none of them work.
<div><br></div><div>i mainly used git over the last 6 months but that force=
s me to pull/commit/push manually each time i add something to either machi=
ne and that is really annoying. plus i get merge conflicts all the time</di=
v>

</div></blockquote><div><br></div><div>I can&#39;t really help for the othe=
r items too easily, but have you tried *not* syncing edits between a single=
 files?=C2=A0 This would at least stop the merge conflicts.=C2=A0 <br><br>T=
hat is, if you had two sets of all of your .org files, one under &quot;desk=
top/&quot; and the other under &quot;laptop/&quot;, then you could setup a =
basic hook in git that pushes/pulls on every change.=C2=A0 I believe org is=
 good with the refile commands that moving between the flies shouldn&#39;t =
be that much of a burden, if you do that often.=C2=A0 Otherwise, things def=
initely work well for agenda mode and such.<br>

<br></div><div>-josh<br></div></div></div></div>

--001a11c12766df6c6b04fa3866b9--