{"thread":{"id":"15454","subject":"[Fwd: Re: git merge vs git commit]","startedAt":"2008-09-09T17:58:28Z","lastAt":"2008-09-09T17:58:28Z","messageCount":1,"participants":["Gustaf Hendeby"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"90244","messageId":"48C6B944.30900@isy.liu.se","threadId":"15454","inReplyTo":null,"subject":"[Fwd: Re: git merge vs git commit]","fromName":"Gustaf Hendeby","fromEmail":"hendeby@isy.liu.se","sentAt":"2008-09-09T17:58:28Z","receivedAt":"2008-09-09T17:58:28Z","isPatch":false,"sender":{"key":"hendeby@isy.liu.se","avatar":"https://avatars.githubusercontent.com/u/730316?v=4"},"body":"Sorry for the dup Junio, once again hit the wrong button when answering...\n\n/Gustaf\n\n-------- Original Message --------\nSubject: Re: git merge vs git commit\nDate: Tue, 09 Sep 2008 19:56:20 +0200\nFrom: Gustaf Hendeby <hendeby@isy.liu.se>\nTo: Junio C Hamano <gitster@pobox.com>\nReferences: <20080909165236.GA8850@flint.arm.linux.org.uk>\n<7vhc8p6x59.fsf@gitster.siamese.dyndns.org>\n\nOn 2008-09-09 19:34, Junio C Hamano wrote:\n> Russell King <rmk@arm.linux.org.uk> writes:\n> \n>> If there aren't any conflicts, you get a nice clean merge, resulting in:\n>> ...\n>> However, if you have a conflict that needs resolving, you fix it up as\n>> ...\n>> instead - an additional reference from commit 'K' back to commit 'A'\n>> which isn't present in the clean merge case.\n>>\n>> Is this intentional, or is it a bug?\n> \n> I think some changes went into 1.6.0 around this area to (r)eject parents\n> that are redundant.  What happens when you use more recent git with the\n> same example?\n\nI get the same result with current next.  Is this the expected result\nwith this work, or an unwanted side effect?\n\n/Gustaf\n"}]}