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
Rémi VanicatRe: Can't merge
html-kurs@gmx.de writes:
> 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?
When git say "Already up-to-date" it tell you that all change introduced in the foo branch are in master. But there could be change in master that are not in foo, making foo and master different. You could try
> gitk foo..master
to see commit that are in master but not in foo and that could introduce the difference between the foo and master branch.
-- Rémi Vanicat