Skip to contentSkip to conversation

Can't merge

DISCUSSION [email protected] 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

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 · 1 line
Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger
#1 lore raw
Quoted 8 lines · [email protected] writes:

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 7 lines
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?

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

Quoted 1 line

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.

Signature · 1 line
Rémi Vanicat