git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Git pull/merge question

From
PSPelle Svensson <pelle2004@gmail.com>
Date
Jun 4, 2007, 12:51 UTC
Message-ID
<6bb9c1030706040551l12a867f2r2788805afaf6104d@mail.gmail.com>
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
Message 1 of 1 in “Git pull/merge question”
  1. Pelle SvenssonJun 4, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.