On Tuesday 25 November 2008, Andrei Pelinescu-Onciul wrote:
[..]
git merge trie Already up-to-date.
Why this don't work? Perhaps something wrong in my configuration? Trying to merge directly from the remote branch also not work:
Your configuration is ok. I was wrong recommending git revert for this, I think it can't work, because it tries to merge, sees that trie was merged in the past and then it tries to merge only what's new on trie since the past merge...
Sorry, I think git revert is not good for undoing a merge commit. It does undo the code changes, but it leaves the merge in the history and so future merges with the same branch think the branch was already merged.
I don't know if this can be done in another way, but for now I'm going to reset master to the commit just before the merge (7e69be). I'll send a message on sr-dev after I do it and then you could retry the merge from the beginning.
Hi Andrei,
ok, thanks for the reset. I'll retry my merge later.
Cheers,
Henning