From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
To: Drew Northup <n1xim.email@gmail.com>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
David Aguilar <davvid@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Maurice Francois <francoismaurice2001@yahoo.ca>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: In search of a version control system
Date: Sun, 21 Oct 2012 20:16:50 +0700 [thread overview]
Message-ID: <CACsJy8ASoaH40ScHwv1EB2kw8sxMh3oFb45s5shUPUmRUF7gRA@mail.gmail.com> (raw)
In-Reply-To: <CAM9Z-nnQjhehJEpyhyTY=rsK_f=2gTOUMVTycn7-Lao8Gog0pA@mail.gmail.com>
On Sun, Oct 21, 2012 at 7:20 PM, Drew Northup <n1xim.email@gmail.com> wrote:
> On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy
> <Matthieu.Moy@grenoble-inp.fr> wrote:
>> David Aguilar <davvid@gmail.com> writes:
>>
>>> I would advise against the file locking, though. You ain't gonna need
>>> it ;-)
>>
>> What do you suggest to merge Word files?
>
> If the files are in the DOCX format you can just expand them as zip
> archives and diff what's inside of them. The text in particular is
> stored as XML.
An XML diff means nothing to a regular user, and manually "merging"
this way can produce unreadable Words files. So no, it's still not an
answer.
--
Duy
next prev parent reply other threads:[~2012-10-21 13:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-08 18:06 In search of a version control system Maurice Francois
2012-10-08 18:24 ` Ramkumar Ramachandra
2012-10-08 18:30 ` Matthieu Moy
2012-10-09 3:19 ` David Aguilar
2012-10-09 5:58 ` Matthieu Moy
2012-10-21 12:20 ` Drew Northup
2012-10-21 13:16 ` Nguyen Thai Ngoc Duy [this message]
2012-10-21 13:25 ` Sitaram Chamarty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACsJy8ASoaH40ScHwv1EB2kw8sxMh3oFb45s5shUPUmRUF7gRA@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=artagnon@gmail.com \
--cc=davvid@gmail.com \
--cc=francoismaurice2001@yahoo.ca \
--cc=git@vger.kernel.org \
--cc=n1xim.email@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).