From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karl Voit Subject: Re: collaborating between org-mode and MS Word users Date: Sat, 29 Dec 2012 19:31:28 +0100 Message-ID: <2012-12-29T19-26-26@devnull.Karl-Voit.at> References: <57278.46.239.234.92.1356615218.squirrel@www.hafro.is> Reply-To: news1142@Karl-Voit.at Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([208.118.235.92]:44957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tp1CH-0004u3-19 for emacs-orgmode@gnu.org; Sat, 29 Dec 2012 13:31:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tp1CD-00058l-2d for emacs-orgmode@gnu.org; Sat, 29 Dec 2012 13:31:48 -0500 Received: from plane.gmane.org ([80.91.229.3]:35943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tp1CC-00058V-TP for emacs-orgmode@gnu.org; Sat, 29 Dec 2012 13:31:45 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Tp1CQ-0000xM-6X for emacs-orgmode@gnu.org; Sat, 29 Dec 2012 19:31:58 +0100 Received: from mail.michael-prokop.at ([88.198.6.110]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 29 Dec 2012 19:31:58 +0100 Received: from news1142 by mail.michael-prokop.at with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 29 Dec 2012 19:31:58 +0100 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: emacs-orgmode@gnu.org * Julian Burgos wrote: > > - Is there a better way to have a non-org mode use to edit/correct a > org-mode document and then bring back the corrections to an org-mode > document? What about simple text files? Export your Org-file into UTF-8, keep a copy of it and compare your copy with the file you will receive from your colleague. Notepad should be sufficient for your colleagues. But it also works with an email client which does not convert to HTML emails. > - What is the best way to compare org-mode nodes/branches (like in the > above example the Version 1 and Version 2 nodes?). Can I use ediff within > an org-mode file? Or should I keep separate versions on separate > documents? Eric already pointed you to git. I absolutely subscribe to this idea. Contrary to Eric I do think that somebody with no prior version control experience is able to learn basics of git with a decent tutorial pretty quickly. The problem with git is that it is so different to SVN and others. This way, people already using SVN and such are having issues when moving to git. -- Karl Voit