All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tim Olsen <tim@brooklynpenguin.com>
To: git@vger.kernel.org
Cc: git@vger.kernel.org
Subject: Re: still getting 'It is a submodule!" in 1.6.2.5
Date: Tue, 05 May 2009 10:23:06 -0400	[thread overview]
Message-ID: <4A004BCA.5070709@brooklynpenguin.com> (raw)
In-Reply-To: <7vy6tc2gnt.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:
> But that is not the one you want.  7dae8b2 (diff -c -p: do not die on
> submodules, 2009-04-29) is to allow viewing of such a merge correctly; To
> make the merge automatically, you'd need 0c44c94 (merge-recursive: do not
> die on a conflicting submodule, 2009-04-29), which is on 'master', but not
> on 1.6.2.X (and likely will never be).
> 
> Could you be running 1.6.3-rcX instead of 1.6.2.X?  In general, the tip of
> the 'master' is always as stable as any released version, if not more.

Thanks Junio for your reply.  We have made a copy of the offending
branch by hand and have managed to merge that instead for now.  I can
wait until 1.6.3 is released.

Thanks again for your help!

Tim

  reply	other threads:[~2009-05-05 14:23 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-04 20:39 still getting 'It is a submodule!" in 1.6.2.5 Tim Olsen
2009-05-05  6:43 ` Junio C Hamano
2009-05-05 14:23   ` Tim Olsen [this message]
2009-05-05 15:23     ` Tim Olsen
2009-05-06  7:31   ` Matthias Andree
     [not found]     ` <20090506180925.6117@nanako3.lavabit.com>
2009-05-06  9:57       ` Matthias Andree

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A004BCA.5070709@brooklynpenguin.com \
    --to=tim@brooklynpenguin.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.