From: Michael Radziej <mir@noris.de>
Date: Thu, 14 May 2009 07:01:29 GMT
Subject: Re: [Q] merge squash unexpected conflicts
Message-ID: <20090514070129.GL8212@noris.de>
In-Reply-To: <bb9d69200905132354h6b64171g24351840fb1d0893@mail.gmail.com>

On Wed, May 13, Cory Sharp wrote:

> Yeah I'm not quite getting it.  Thanks for trying to explain, though.

git merge --squash is not a merge at all. It only creates a regular commit
with one parent. It is useful only in very special circumstances.


Michael

-- 
noris network AG - Deutschherrnstraße 15-19 - D-90429 Nürnberg -
Tel +49-911-9352-0 - Fax +49-911-9352-100
http://www.noris.de - The IT-Outsourcing Company
 
Vorstand: Ingo Kraupa (Vorsitzender), Joachim Astel, Hansjochen Klenk - 
Vorsitzender des Aufsichtsrats: Stefan Schnabel - AG Nürnberg HRB 17689