Skip to contentSkip to conversation

Can't merge

DISCUSSION [email protected] 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

I'm sorry. for the first mail.
The changes were all made in master ...
So what I wanted was

Quoted 2 lines

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: [email protected]
An: [email protected]
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.

Quoted 1 line

git diff foo

shows many diffs.
But

Quoted 1 line

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

Signature · 5 lines
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