From: Rogan Dawes <lists@dawes.za.net>
To: saurabh gupta <saurabhgupta1403@gmail.com>
Cc: david@lang.hm, Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org
Subject: Re: Google Summer of Code 2009: GIT
Date: Fri, 13 Mar 2009 11:41:34 +0200 [thread overview]
Message-ID: <49BA2A4E.3030506@dawes.za.net> (raw)
In-Reply-To: <ab9fa62a0903121123v35004215hbb64f0ad65399d9f@mail.gmail.com>
saurabh gupta wrote:
>> exactly. and how you mark the conflict to have it be valid XML is
>> going to depend on details of the type of file. there are probably
>> a few basic methods that will work the vast majority of the time,
>> but with some details needing to be configurable.
>>
>> for example, if the XML document is a ODF document, it may be
>> possible to add 'revision' tags around the conflict that are
>> already understood by the editor.
>
> Exactly. This includes the work to modify the xml tags and add
> contents to represent marker in the best way.
On the XML topic, one last thing to keep in mind is the DTD/XSD which
governs the file.
Rogan
next prev parent reply other threads:[~2009-03-13 9:43 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-11 4:52 Google Summer of Code 2009: GIT Saurabh Gupta
2009-03-11 5:56 ` Daniel Barkalow
[not found] ` <ab9fa62a0903102317l3a7322f7w5e4d9ba0e02af37b@mail.gmail.com>
2009-03-11 9:04 ` saurabh gupta
2009-03-11 8:59 ` David Symonds
2009-03-11 9:02 ` saurabh gupta
2009-03-11 11:55 ` Johannes Schindelin
2009-03-11 11:55 ` David Symonds
2009-03-11 12:52 ` Johannes Schindelin
2009-03-11 11:58 ` Johannes Schindelin
2009-03-11 12:11 ` saurabh gupta
2009-03-11 12:58 ` Johannes Schindelin
2009-03-11 13:55 ` saurabh gupta
2009-03-11 14:02 ` Johannes Schindelin
2009-03-11 14:13 ` saurabh gupta
2009-03-11 15:27 ` Rogan Dawes
2009-03-11 16:21 ` saurabh gupta
2009-03-11 15:38 ` Johannes Schindelin
2009-03-11 16:29 ` saurabh gupta
2009-03-11 16:29 ` Daniel Barkalow
2009-03-11 16:44 ` Johannes Schindelin
2009-03-12 12:56 ` Michael J Gruber
2009-03-12 13:07 ` Johannes Schindelin
2009-03-12 13:15 ` Michael J Gruber
2009-03-12 18:25 ` david
2009-03-11 16:58 ` saurabh gupta
2009-03-12 12:47 ` Michael J Gruber
2009-03-11 16:32 ` david
2009-03-11 17:01 ` Johannes Schindelin
2009-03-11 19:30 ` david
2009-03-11 19:55 ` Johannes Schindelin
2009-03-11 17:07 ` saurabh gupta
2009-03-11 19:29 ` david
2009-03-11 20:02 ` saurabh gupta
2009-03-11 20:21 ` david
2009-03-11 20:37 ` Johannes Schindelin
2009-03-11 21:05 ` david
2009-03-11 21:47 ` Junio C Hamano
2009-03-12 1:57 ` thestar
2009-03-12 7:40 ` Junio C Hamano
2009-03-12 12:45 ` saurabh gupta
2009-03-12 18:00 ` david
2009-03-12 18:43 ` Junio C Hamano
[not found] ` <ab9fa62a0903121119j6c2a1d43kd9cda99db47b5e7c@mail.gmail.com>
2009-03-12 18:53 ` david
2009-03-12 19:00 ` saurabh gupta
2009-03-12 19:29 ` david
2009-03-12 19:45 ` saurabh gupta
2009-03-12 19:59 ` david
2009-03-12 20:03 ` saurabh gupta
2009-03-12 20:45 ` david
2009-03-13 3:15 ` saurabh gupta
2009-03-18 23:16 ` Johannes Schindelin
2009-03-18 23:55 ` david
2009-03-19 0:43 ` Johannes Schindelin
2009-03-19 8:37 ` david
2009-03-19 10:24 ` Johannes Schindelin
2009-03-19 19:12 ` david
2009-03-19 19:23 ` saurabh gupta
2009-03-19 6:30 ` Caleb Cushing
2009-03-19 10:19 ` Johannes Schindelin
2009-03-21 23:53 ` Caleb Cushing
2009-03-19 19:17 ` saurabh gupta
2009-03-19 23:42 ` Johannes Schindelin
2009-03-20 0:07 ` david
2009-03-20 0:30 ` Johannes Schindelin
2009-03-20 3:09 ` david
2009-03-20 9:35 ` Johannes Schindelin
2009-03-20 20:50 ` david
2009-03-21 17:38 ` saurabh gupta
[not found] ` <ab9fa62a0903211031l78c7afadg9409a544f2bda7db@mail.gmail.com>
2009-03-21 17:36 ` saurabh gupta
2009-03-12 20:18 ` Junio C Hamano
2009-03-12 12:42 ` saurabh gupta
2009-03-12 18:03 ` david
2009-03-12 18:23 ` saurabh gupta
2009-03-13 9:41 ` Rogan Dawes [this message]
2009-03-13 20:18 ` saurabh gupta
2009-03-11 19:36 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49BA2A4E.3030506@dawes.za.net \
--to=lists@dawes.za.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=david@lang.hm \
--cc=git@vger.kernel.org \
--cc=saurabhgupta1403@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.