From mboxrd@z Thu Jan  1 00:00:00 1970
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: Google Summer of Code 2009: GIT
Date: Wed, 11 Mar 2009 17:44:48 +0100 (CET)
Message-ID: <alpine.DEB.1.00.0903111742360.10498@intel-tinevez-2-302>
References: <49B74373.3090609@gmail.com>  <alpine.DEB.1.00.0903111255470.10279@pacific.mpi-cbg.de>  <ab9fa62a0903110511u63e7d46dr3bb783ee891ca4ae@mail.gmail.com>  <alpine.DEB.1.00.0903111353340.10498@intel-tinevez-2-302>  <ab9fa62a0903110655y4a47ccfkde0984ecb46b3307@mail.gmail.com>
  <alpine.DEB.1.00.0903111458340.10498@intel-tinevez-2-302> <ab9fa62a0903110713k2a21cefbj1e7cd3c126aca8f9@mail.gmail.com> <alpine.LNX.1.00.0903111159530.19665@iabervon.org>
Mime-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Cc: saurabh gupta <saurabhgupta1403@gmail.com>, git@vger.kernel.org
To: Daniel Barkalow <barkalow@iabervon.org>
X-From: git-owner@vger.kernel.org Wed Mar 11 17:47:10 2009
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1LhRa1-0007TX-3e
	for gcvg-git-2@gmane.org; Wed, 11 Mar 2009 17:46:53 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752993AbZCKQox (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Wed, 11 Mar 2009 12:44:53 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751106AbZCKQow
	(ORCPT <rfc822;git-outgoing>); Wed, 11 Mar 2009 12:44:52 -0400
Received: from mail.gmx.net ([213.165.64.20]:57651 "HELO mail.gmx.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP
	id S1750764AbZCKQow (ORCPT <rfc822;git@vger.kernel.org>);
	Wed, 11 Mar 2009 12:44:52 -0400
Received: (qmail invoked by alias); 11 Mar 2009 16:44:49 -0000
Received: from cbg-off-client.mpi-cbg.de (EHLO intel-tinevez-2-302.mpi-cbg.de) [141.5.11.5]
  by mail.gmx.net (mp023) with SMTP; 11 Mar 2009 17:44:49 +0100
X-Authenticated: #1490710
X-Provags-ID: V01U2FsdGVkX19A+4tYFLFA1y3viMhPsBoZxIANZUhh+gCDsiEd9x
	5vGf0BzcjHIRG+
X-X-Sender: schindel@intel-tinevez-2-302
In-Reply-To: <alpine.LNX.1.00.0903111159530.19665@iabervon.org>
User-Agent: Alpine 1.00 (DEB 882 2007-12-20)
X-Y-GMX-Trusted: 0
X-FuHaFi: 0.67
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/112956>

Hi,

On Wed, 11 Mar 2009, Daniel Barkalow wrote:

> One thing that I think would be good whenever possible is to have the 
> merge program generate a file in the same format which is easily 
> recognizable as having conflict markers. For example, I think it should 
> be possible to show conflicts in the text of office documents by having 
> styles for each side of the merge, and show each side's content in the 
> appropriate style. Then the user opens the document with their choice of 
> office software, finds the things in the conflict styles, and decides 
> what the result should be.

That's a very good idea!  (Except for LaTeX, maybe...)

For SVG, you could add both versions of a modified object, for 
example, maybe with some visual effect to show the version...

Ciao,
Dscho