Hi Johannes,

So, I tried recreating the problem:

> git clone git://github.com/JohannesKlug/hummingbird.git

So, I want to retry the same merge locally and see if I get the same 
results. The merge commit has two parents, I'll create two branches based on 
each of these commits.

The first commit: I first reset back to the commit before the merge:

> git reset --hard e704b9191a5a28c5906dc67bf1dd3c150bc17cc2

I now just give the current commit a new branch name for the experiment:

> git checkout -b foo

I now create the second branch:

> git checkout 72065c6710e2db8dd7ef2ec64c81a586c1821f38
(results in detached, I'll make a new branch with this name:
> git checkout -b bar

Now, do the merge itself:
> git checkout foo
> git merge bar

Result: I get the same conflict, which I resolve, and then I commit. Here's 
the last commit:

commit b0fc1983c3382ac64207cf6fe812c5da51577016
Merge: e704b91 72065c6
Author: Thomas Ferris Nicolaisen <tfn...@gmail.com>
Date:   Thu Apr 28 10:10:19 2011 +0200

    Merge branch 'bar' into funk
    
    Conflicts:
       
 
src/business/validation/src/test/java/org/hbird/business/validation/UpperLowerCountTest.java

diff --cc 
src/business/validation/src/test/java/org/hbird/business/validation/UpperLowerCountTest.java
index 3e13bc3,c346503..dc36915
--- 
a/src/business/validation/src/test/java/org/hbird/business/validation/UpperLowerCountTest.java
+++ 
b/src/business/validation/src/test/java/org/hbird/business/validation/UpperLowerCountTest.java
...


So, no other changes in other files.

Smells like something went totally wrong with your merge. What commands did 
you do exactly? Can you recreate the experiment like I have done above?

Also post your .gitconfig, maybe there's something wrong in there.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to