flavour/eden — pull request #98 by graeme-f (2012-05-27 15:15:41+00:00)
Title: I don't understand what is happening with git

I've just done a git pull upstream master as I normally do, during the rebase I spent the last hour fixing merge conflicts and found out that it has pulled in commits from the last 16 days...

Very rude words come to mind and I don't know which of my code I need to get into trunk and what is already there.