* Can't merge
@ 2008-10-27 16:52 html-kurs
2008-10-27 19:14 ` Rémi Vanicat
0 siblings, 1 reply; 2+ messages in thread
From: html-kurs @ 2008-10-27 16:52 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Can't merge
2008-10-27 16:52 Can't merge html-kurs
@ 2008-10-27 19:14 ` Rémi Vanicat
0 siblings, 0 replies; 2+ messages in thread
From: Rémi Vanicat @ 2008-10-27 19:14 UTC (permalink / raw)
To: html-kurs; +Cc: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-10-27 19:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-27 16:52 Can't merge html-kurs
2008-10-27 19:14 ` Rémi Vanicat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).