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

Re: warning merge message

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 21, 2006, 09:23 UTC
Message-ID
<Pine.LNX.4.63.0612211022280.19693@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<867728.44872.qm@web31814.mail.mud.yahoo.com>
Hi,
On Wed, 20 Dec 2006, Luben Tuikov wrote:
> Can we please eliminate this f@#$ing message:
> Warning: No merge candidate found because value of config option
>          "branch.master.merge" does not match any remote branch fetched.

Well, you can always tell git explicitely what you want. I.e. specify the remote _and_ the branch you want to merge.

BTW I am still waiting for your test results regarding the segmentation fault of merge-recursive.

Ciao, Dscho

Previous: Luben TuikovNext: Luben Tuikov
Message 2 of 11 in “warning merge message”
  1. Luben TuikovDec 20, 2006
  2. Johannes SchindelinDec 21, 2006
  3. Luben TuikovDec 22, 2006
  4. Shawn PearceDec 22, 2006
  5. Junio C HamanoDec 22, 2006
  6. Junio C HamanoDec 22, 2006
  7. Josef WeidendorferDec 22, 2006
  8. Junio C HamanoDec 22, 2006
  9. Josef WeidendorferDec 22, 2006
  10. Junio C HamanoDec 22, 2006
  11. Josef WeidendorferDec 23, 2006

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.