From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 20 Apr 2009 09:49:57 GMT
Subject: Re: correct git merge behavior or corner case?
Message-ID: <alpine.DEB.1.00.0904201148150.6955@intel-tinevez-2-302>
In-Reply-To: <4ac8254d0904191540j68246cd8qa36a034209d4c800@mail.gmail.com>

Hi,

On Mon, 20 Apr 2009, Tuncer Ayaz wrote:

> I have stumbled upon the following blog post via one of the news 
> aggegrators and wondered whether the behavior is correct and expected or 
> he's expecting something wrong or doing something wrong.
> 
> I cannot see a wrong usage pattern from what he has written.
> 
> http://blog.teksol.info/2009/04/15/beware-of-gits-content-tracking.html
> 
> as the author hasn't posted here after a couple of days I decided to 
> take his question here for at least understanding what behavior he is 
> experiencing.

First, a blog posting is a lousy place to post complaints.  That just 
decreased my confidence level in the competence of Francois.

Second, he does not state what he expects to see instead.  And for the 
love of God, I cannot see what should be wrong in the output he gets.  
Another few notches down.

Ciao,
Dscho