All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jack Howarth <howarth@bromo.msbb.uc.edu>
To: linux-kernel@vger.kernel.org
Subject: merging branches remotely with git?
Date: Thu, 24 Jul 2008 13:30:30 -0400	[thread overview]
Message-ID: <20080724173030.GA7609@bromo.msbb.uc.edu> (raw)

    I am trying to do a local merge of the linus-kernel git and
the my-wireless-testing git. Is this possible? I have cloned both
locally with...

git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
git clone git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/my-wireless-testing.git

I thought from the git documentation that I was supposed to be able to
create a merge automatically with...

git merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/my-wireless-testing.git

however this reports...

git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git - not something we can merge

Any advice on how this can be done would be appreciated.
                  Jack

             reply	other threads:[~2008-07-24 17:30 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-24 17:30 Jack Howarth [this message]
2008-07-24 19:09 ` merging branches remotely with git? Daniel Barkalow
2008-07-24 22:48   ` Jack Howarth
2008-07-24 23:10     ` Daniel Barkalow
2008-07-25 11:22     ` git snapshots (Was: Re: merging branches remotely with git?) Uwe Kleine-König
2008-07-25 11:42       ` Mark McLoughlin
2008-07-25 23:44         ` Jack Howarth
2008-07-26  2:13           ` Bart Trojanowski

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=20080724173030.GA7609@bromo.msbb.uc.edu \
    --to=howarth@bromo.msbb.uc.edu \
    --cc=linux-kernel@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.