Xebar,
its funny you just posted this as of all the excellent responses in this
thread i was looking into git-annex as a solution. The issue is that im not
very technical (im an academic not a programmer) and its seems mighty
complicated. Also in addition git-assistant is currently isnt
Ian Barton writes:
On 01/07/13 13:06, Xebar Saram wrote:
Hi all
I have been using dropbox since i started using orgmode a few weeks ago
(yeah im a neewb :)), which kinda works but i find it very annoying as
it keeps creating conflicted copies, isnt reliable on my Linux main
machine etc
Thx Chris
its funny you just posted this as of all the excellent responses in this
thread i was looking into git-annex as a solution. The issue is that im not
very technical (im an academic not a programmer) and its seems mighty
complicated. Also in addition git-assistant is currently isnt
fatkasuvayu+li...@gmail.com writes:
On Tue, Jul 02, 2013 at 04:27:27PM +0200, Alan Schmitt wrote:
If someone can show me how to launch ediff from the command line, I can
explain how to set up Unison for it (I found this old question
On 01/07/13 13:06, Xebar Saram wrote:
Hi all
I have been using dropbox since i started using orgmode a few weeks ago
(yeah im a neewb :)), which kinda works but i find it very annoying as
it keeps creating conflicted copies, isnt reliable on my Linux main
machine etc etc..
I was wondering what
Ian Barton li...@wilkesley.net writes:
I used to use Dropbox and git. However, as you have found I often got
Conflicted Files. This is a particular problem if it happens in your
.git folder, because it can lead to a corrupt git repo. Even though I
have a remote git repo, this still lead to
Hi,
Xebar Saram zelt...@gmail.com writes:
I was wondering what you guys do for syncing org files between PC's, Os's,
devices (android etc)..
There have been lot's of awesome solutions provided in this thread. Mine
is quite similar but I think it is worth describing it anyway.
I use git (a
Hi Itai,
you have been given a lot of detailed advice, so I do not know, if my
contribution will add anything.
I have made good experiences with a combination of unison and git. I
currently synchonise my netbook and my laptop; it is a rather simple and
homebrew setup but it works for my
G. Martin Butz m...@mkblog.org writes:
I wrote a blog entry about the issue [1], but it's in German. If you
interested I can give further information in English.
The Chromium browser did an OK job of translating it: I think the
translation is rough but readable.
[1]
devn...@karl-voit.at writes:
Unison does not offer any merge functionality. However, you can
easily use third party tools to handle merge conflicts (Emacs, vim,
...).
(Disclaimer, I participate in Unison's development). Just to clarify
what I think Karl is saying: one can plug in external
* Alan Schmitt alan.schm...@polytechnique.org wrote:
devn...@karl-voit.at writes:
Unison does not offer any merge functionality. However, you can
easily use third party tools to handle merge conflicts (Emacs, vim,
...).
(Disclaimer, I participate in Unison's development).
Jay! \o/
Just
Hi,
Nice discussion. I hope it makes it into a Worg page eventually :)
Karl Voit devn...@karl-voit.at writes:
* Alan Schmitt alan.schm...@polytechnique.org wrote:
Just to clarify what I think Karl is saying: one can plug in
external tools to handle merge into unison, these tools can be
Hi,
Rasmus writes:
Another option is Git Annex. In my experience, it takes some effort
to get used to it, but perhaps less so if you're used to git. One can
configure it to use regular git for e.g. text files. It's build with
Haskell (and success of building it is more or less random),
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.br...@gmail.com wrote:
bzr and hg are (superficially?) easier and git is pretty dominant.
[...chomp...chomp...chomp...]
But I agree with Brian that in
Wow
thx guys, so many great tips ill slowly start looking into them. as i said
i am a neewb (and not to technical :)).
Alan, a unison guide focused on org would be great as some of the guys
mentioned.
best to all and thx alot for the info its truly helpful
take care
-Itai
On Tue, Jul 2,
Hello Karl,
devn...@karl-voit.at writes:
Alan, how about a short how-to on Worg about Unison and Org-mode
methods?
Well, what would be there? If there is (and there may be) an external
tool that knows how to merge org files (it can be a 3-way merge, if it
makes things simpler), I could try to
Alan Schmitt alan.schm...@polytechnique.org writes:
Alan, how about a short how-to on Worg about Unison and Org-mode
methods?
Well, what would be there? If there is (and there may be) an external
tool that knows how to merge org files (it can be a 3-way merge, if it
makes things simpler), I
ras...@gmx.us writes:
Alan Schmitt alan.schm...@polytechnique.org writes:
Alan, how about a short how-to on Worg about Unison and Org-mode
methods?
Well, what would be there? If there is (and there may be) an external
tool that knows how to merge org files (it can be a 3-way merge, if it
Alan Schmitt alan.schm...@polytechnique.org writes:
Well, what would be there? If there is (and there may be) an external
tool that knows how to merge org files (it can be a 3-way merge, if it
makes things simpler), I could try to devise the magical incantation to
use it.
It is not
Suvayu Ali writes:
I have noticed that git *always* conflicts with TODO state changes. It
seems changes to a headline is not easy to resolve.
You mean you change state in a file and git fails to merge this on the
other side, although you didn't change the same line there? I've never
seen such
On Tue, Jul 02, 2013 at 04:27:27PM +0200, Alan Schmitt wrote:
If someone can show me how to launch ediff from the command line, I can
explain how to set up Unison for it (I found this old question
http://superuser.com/questions/81958/how-to-make-emacsclient-wait-when-using-the-eval-option
Hi David,
On Tue, Jul 02, 2013 at 05:59:36PM +0200, David Engster wrote:
Suvayu Ali writes:
I have noticed that git *always* conflicts with TODO state changes. It
seems changes to a headline is not easy to resolve.
You mean you change state in a file and git fails to merge this on the
Suvayu Ali writes:
That said, I think you might be right. Possibly it could be resolved by
just changing the algorithm, I don't know why I never tried that though.
You might want to try setting diff.algorithm to 'patience' and maybe
also raise diff.context to something like 6 or so if that
On Tue, Jul 02, 2013 at 06:11:14PM +0200, David Engster wrote:
Suvayu Ali writes:
That said, I think you might be right. Possibly it could be resolved by
just changing the algorithm, I don't know why I never tried that though.
You might want to try setting diff.algorithm to 'patience' and
Xebar Saram zeltakc at gmail.com writes:
Alan, a unison guide focused on org would be great as some of the guys
mentioned.
As an example, I use the following ~/.unison/Org.prf file to sync files
between Org folders on a Debian Linux laptop and an Android phone:
# Unison preferences
label =
Hi,
I use git-sync against my own server, and replicate mobileOrg to a
webdav directory from there.
https://github.com/simonthum/git-sync
git-sync is intended for people who are git-savy, though.
Cheers,
Simon
On 07/01/2013 02:06 PM, Xebar Saram wrote:
Hi all
I have been using dropbox
Hi all
I have been using dropbox since i started using orgmode a few weeks ago
(yeah im a neewb :)), which kinda works but i find it very annoying as it
keeps creating conflicted copies, isnt reliable on my Linux main machine
etc etc..
I was wondering what you guys do for syncing org files
On Jul 1, 2013 8:26 AM, Xebar Saram zelt...@gmail.com wrote:
Hi all
I have been using dropbox since i started using orgmode a few weeks ago
(yeah im a neewb :)), which kinda works but i find it very annoying as it
keeps creating conflicted copies, isnt reliable on my Linux main machine
etc
On Mon, Jul 1, 2013 at 1:10 PM, Brian van den Broek
brian.van.den.br...@gmail.com wrote:
On Jul 1, 2013 8:26 AM, Xebar Saram zelt...@gmail.com wrote:
Hi all
I have been using dropbox since i started using orgmode a few weeks ago
(yeah im a neewb :)), which kinda works but i find it
Hi Itai,
zelt...@gmail.com writes:
Hi all
I have been using dropbox since i started using orgmode a few weeks ago
(yeah im a neewb :)), which kinda works but i find it very annoying as it
keeps creating conflicted copies, isnt reliable on my Linux main machine
etc etc..
I was wondering
* Tomas Grigera tgrig...@gmail.com wrote:
To me, a rather reliable way (without version control) has been unison.
Easy to set up and learn, fast. Only problem is that it doesn't deal well
(actually, at all) with merges (i.e. a file that has been modified in both
computers).
I am using
31 matches
Mail list logo
