From: html-kurs@gmx.de
To: git@vger.kernel.org
Subject: Can't merge
Date: Mon, 27 Oct 2008 17:52:47 +0100 [thread overview]
Message-ID: <20081027165247.141110@gmx.net> (raw)
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
next reply other threads:[~2008-10-27 16:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-27 16:52 html-kurs [this message]
2008-10-27 19:14 ` Can't merge Rémi Vanicat
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081027165247.141110@gmx.net \
--to=html-kurs@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.