* Git pull/merge question
@ 2007-06-04 12:51 Pelle Svensson
0 siblings, 0 replies; only message in thread
From: Pelle Svensson @ 2007-06-04 12:51 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-06-04 12:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-04 12:51 Git pull/merge question Pelle Svensson
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).