Hi Dror, Dror Atariah <dror...@gmail.com> writes:
> What other issues are there? What do you do when you keep > your org file under VC? Only a small part of the answer, but you might be interested in the Git Org merge driver: http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/ -- Bastien