From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bradley Wagner Subject: Re: What is the scenario for a commit with 3 or more parents Date: Thu, 29 Jul 2010 13:57:53 -0400 Message-ID: References: <20100729021946.GG25268@spearce.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: "Shawn O. Pearce" , git@vger.kernel.org To: Sverre Rabbelier X-From: git-owner@vger.kernel.org Thu Jul 29 19:58:00 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OeXMm-0005bd-4A for gcvg-git-2@lo.gmane.org; Thu, 29 Jul 2010 19:58:00 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752570Ab0G2R5z convert rfc822-to-quoted-printable (ORCPT ); Thu, 29 Jul 2010 13:57:55 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:42846 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751417Ab0G2R5y convert rfc822-to-8bit (ORCPT ); Thu, 29 Jul 2010 13:57:54 -0400 Received: by pwi5 with SMTP id 5so212613pwi.19 for ; Thu, 29 Jul 2010 10:57:54 -0700 (PDT) Received: by 10.114.197.17 with SMTP id u17mr669541waf.36.1280426274297; Thu, 29 Jul 2010 10:57:54 -0700 (PDT) Received: by 10.229.236.2 with HTTP; Thu, 29 Jul 2010 10:57:53 -0700 (PDT) In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Thu, Jul 29, 2010 at 1:55 PM, Sverre Rabbelier wrote: > > Heya, > > On Wed, Jul 28, 2010 at 21:19, Shawn O. Pearce = wrote: > > Yes. =A0Its called an octopus merge. =A0It happpens sometimes when > > merging 2 or more otherwise fairly isolated changes in a single > > shot. =A0E.g. `git merge feature-a feature-b thing-c`. > > Do we have an explanation anywhere as to when one would use a octopus= merge? Another question I had about this: isn't this documentation about "multi-way merge" inaccurate: http://book.git-scm.com/5_advanced_branching_and_merging.html. Sounds like it's not equivalent to merging each branch individually. > > -- > Cheers, > > Sverre Rabbelier