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

Can't merge

From
Hhtml-kurs@gmx.de <html-kurs@gmx.de>
Date
Oct 27, 2008, 16:52 UTC
Message-ID
<20081027165247.141110@gmx.net>
Hi,

I've run in trouble when trying to merge a branch: I've got a branch "foo". I checkout master.

> git diff foo

shows many diffs. But 

> git merge foo

says: Already up-to-date.

I'm using version 1.6.0.2
Any idea what I'm doing wrong?

TIA, Martin

-- 
Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger
Next: Rémi Vanicat
Message 1 of 2 in “Can't merge”
  1. html-kurs@gmx.deOct 27, 2008
  2. Rémi VanicatOct 27, 2008

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.