{"thread":{"id":"8427","subject":"Git pull/merge question","startedAt":"2007-06-04T12:51:06Z","lastAt":"2007-06-04T12:51:06Z","messageCount":1,"participants":["Pelle Svensson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"43973","messageId":"6bb9c1030706040551l12a867f2r2788805afaf6104d@mail.gmail.com","threadId":"8427","inReplyTo":null,"subject":"Git pull/merge question","fromName":"Pelle Svensson","fromEmail":"pelle2004@gmail.com","sentAt":"2007-06-04T12:51:06Z","receivedAt":"2007-06-04T12:51:06Z","isPatch":false,"sender":{"key":"pelle2004@gmail.com","avatar":null},"body":"Hi,\n\nI used to pull using version 1.4.x from Linus tree but with version\n1.5.x I can't get\nit upp and running in the same way.\n\ngit-pull complains about:\n'No merge candidate founde because value of config option\" branch.my.merge\nI tried git-config --add ... with orgin and master but no luck.\n\nI also seems to be stuck on version 2.6.21 on my branch. First pull\npicked up a lot of changes but did no merge it into my tree.\nWhat should I do to get git-pull working and at the same time merge\nthe stuff and roll my branch forward to the latest version?\n\ngit-pull  -> Warns about merge candidate\ngit-pull . master -> Says up to date\ngit-status -> Only list 3 files not commited due to changes I did.\n\n/Pelle\n"}]}