[git-users] Re: Merge went wrong?

2011-04-28 Thread Thomas Ferris Nicolaisen
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:

[git-users] Re: Merge went wrong?

2011-04-28 Thread Johannes Klug
Thomas, thank you very much for spending your time looking into this. I suppose we'll just live with every file being touched by this merge, and continue from here. Maybe egit caused this? -- You received this message because you are subscribed to the Google Groups Git for human beings group.