From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Berry 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: References: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11c12766df6c6b04fa3866b9 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) 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 ; Sun, 25 May 2014 05:14:17 -0700 (PDT) In-Reply-To: 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: Xebar Saram Cc: org mode --001a11c12766df6c6b04fa3866b9 Content-Type: text/plain; charset=UTF-8 On Sat, May 24, 2014 at 1:11 AM, Xebar Saram 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



On Sat, May 24, 2014 at 1:11 AM, Xebar Saram <= zeltakc@gmail.com> wrote:
=C2=A0need to sync my main = work TODO org file between my work PC and laptop i carry aroun= d on work related trips and when im at home. i have tried seve= ral methods buy really none of them work.

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

I can'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

T= hat is, if you had two sets of all of your .org files, one under "desk= top/" and the other under "laptop/", 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'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.

-josh
--001a11c12766df6c6b04fa3866b9--