Re: [Q] merge squash unexpected conflicts
From: Michael Radziej <hidden>
Date: 2016-06-15 22:46:46
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