{"thread":{"id":"16062","subject":"Fwd: Can't merge","startedAt":"2008-10-27T17:03:16Z","lastAt":"2008-10-27T17:03:16Z","messageCount":1,"participants":["html-kurs@gmx.de"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"94061","messageId":"20081027170316.217060@gmx.net","threadId":"16062","inReplyTo":null,"subject":"Fwd: Can't merge","fromName":"","fromEmail":"html-kurs@gmx.de","sentAt":"2008-10-27T17:03:16Z","receivedAt":"2008-10-27T17:03:16Z","isPatch":false,"sender":{"key":"html-kurs@gmx.de","avatar":null},"body":"I'm sorry. for the first mail. \nThe changes were all made in master ...\nSo what I wanted was\n> git checkout foo\n> git merge master \n\nAnyone got a can of perri air for me ? ;-)\n\n-------- Original-Nachricht --------\nDatum: Mon, 27 Oct 2008 17:52:47 +0100\nVon: html-kurs@gmx.de\nAn: git@vger.kernel.org\nBetreff: Can\\'t merge\n\nHi,\n\nI've run in trouble when trying to merge a branch:\nI've got a branch \"foo\".\nI checkout master.\n> git diff foo \nshows many diffs.\nBut \n> git merge foo\nsays:\nAlready up-to-date.\n\nI'm using version 1.6.0.2\n\nAny idea what I'm doing wrong?\n\nTIA,\nMartin\n\n-- \nPsssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger\n\n-- \n\"Feel free\" - 10 GB Mailbox, 100 FreeSMS/Monat ...\nJetzt GMX TopMail testen: http://www.gmx.net/de/go/topmail\n"}]}