{"thread":{"id":"16061","subject":"Can't merge","startedAt":"2008-10-27T16:52:47Z","lastAt":"2008-10-27T19:14:20Z","messageCount":2,"participants":["html-kurs@gmx.de","Rémi Vanicat"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"94060","messageId":"20081027165247.141110@gmx.net","threadId":"16061","inReplyTo":null,"subject":"Can't merge","fromName":"","fromEmail":"html-kurs@gmx.de","sentAt":"2008-10-27T16:52:47Z","receivedAt":"2008-10-27T16:52:47Z","isPatch":false,"sender":{"key":"html-kurs@gmx.de","avatar":null},"body":"Hi,\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"},{"id":"94067","messageId":"87zlkp7svn.dlv@maison.homelinux.org","threadId":"16061","inReplyTo":"20081027165247.141110@gmx.net","subject":"Re: Can't merge","fromName":"Rémi Vanicat","fromEmail":"vanicat@debian.org","sentAt":"2008-10-27T19:14:20Z","receivedAt":"2008-10-27T19:14:20Z","isPatch":false,"sender":{"key":"vanicat@debian.org","avatar":"https://gravatar.com/avatar/cd491a7f4c221349809a60f88fc21326b97cce2a705e318898aa74851db92409?d=mp&s=160"},"body":"html-kurs@gmx.de writes:\n\n> Hi,\n>\n> I've run in trouble when trying to merge a branch:\n> I've got a branch \"foo\".\n> I checkout master.\n>> git diff foo \n> shows many diffs.\n> But \n>> git merge foo\n> says:\n> Already up-to-date.\n>\n> I'm using version 1.6.0.2\n>\n> Any idea what I'm doing wrong?\n\nWhen git say \"Already up-to-date\" it tell you that all change introduced\nin the foo branch are in master. But there could be change in master\nthat are not in foo, making foo and master different. You could try \n\n> gitk foo..master\nto see commit that are in master but not in foo and that could introduce\nthe difference between the foo and master branch.\n\n\n-- \nRémi Vanicat\n"}]}