From: "Pelle Svensson" <pelle2004@gmail.com>
To: git@vger.kernel.org
Subject: Git pull/merge question
Date: Mon, 4 Jun 2007 14:51:06 +0200 [thread overview]
Message-ID: <6bb9c1030706040551l12a867f2r2788805afaf6104d@mail.gmail.com> (raw)
Hi,
I used to pull using version 1.4.x from Linus tree but with version
1.5.x I can't get
it upp and running in the same way.
git-pull complains about:
'No merge candidate founde because value of config option" branch.my.merge
I tried git-config --add ... with orgin and master but no luck.
I also seems to be stuck on version 2.6.21 on my branch. First pull
picked up a lot of changes but did no merge it into my tree.
What should I do to get git-pull working and at the same time merge
the stuff and roll my branch forward to the latest version?
git-pull -> Warns about merge candidate
git-pull . master -> Says up to date
git-status -> Only list 3 files not commited due to changes I did.
/Pelle
reply other threads:[~2007-06-04 12:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=6bb9c1030706040551l12a867f2r2788805afaf6104d@mail.gmail.com \
--to=pelle2004@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).