git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: In search of a version control system

From
Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date
Oct 21, 2012, 13:16 UTC
Message-ID
<CACsJy8ASoaH40ScHwv1EB2kw8sxMh3oFb45s5shUPUmRUF7gRA@mail.gmail.com>
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:
Show 12 quoted lines
> 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
Previous: Drew NorthupNext: Sitaram Chamarty
Message 7 of 8 in “In search of a version control system”
  1. Maurice FrancoisOct 8, 2012
  2. Ramkumar RamachandraOct 8, 2012
  3. Matthieu MoyOct 8, 2012
  4. David AguilarOct 9, 2012
  5. Matthieu MoyOct 9, 2012
  6. Drew NorthupOct 21, 2012
  7. Nguyen Thai Ngoc DuyOct 21, 2012
  8. Sitaram ChamartyOct 21, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.