From: Cory Sharp Date: Thu, 14 May 2009 06:54:41 GMT Subject: Re: [Q] merge squash unexpected conflicts Message-ID: In-Reply-To: <7v4ovoxk0n.fsf@alter.siamese.dyndns.org> On Wed, May 13, 2009 at 11:42 PM, Junio C Hamano wrote: > Because "merge" is (no surprise) what tracks what (two or more) things > were merged.  And with --squash you are choosing not to make a merge.  I > am not sure if there is any more thing to be explained... Yeah I'm not quite getting it. Thanks for trying to explain, though.