* Fwd: Can't merge
@ 2008-10-27 17:03 html-kurs
0 siblings, 0 replies; only message in thread
From: html-kurs @ 2008-10-27 17:03 UTC (permalink / raw)
To: git
I'm sorry. for the first mail.
The changes were all made in master ...
So what I wanted was
> git checkout foo
> git merge master
Anyone got a can of perri air for me ? ;-)
-------- Original-Nachricht --------
Datum: Mon, 27 Oct 2008 17:52:47 +0100
Von: html-kurs@gmx.de
An: git@vger.kernel.org
Betreff: Can\'t merge
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
--
"Feel free" - 10 GB Mailbox, 100 FreeSMS/Monat ...
Jetzt GMX TopMail testen: http://www.gmx.net/de/go/topmail
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-10-27 17:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-10-27 17:03 Fwd: Can't merge html-kurs
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).