Re: [Q] merge squash unexpected conflicts
From: Cory Sharp <hidden>
Date: 2016-06-15 22:46:46
On Wed, May 13, 2009 at 11:42 PM, Junio C Hamano [off-list ref] 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.