well, I did that with not so great results. My examples didn't work any more. I went back using `git reflog` and then tried again more carefully. No luck - it seems that the automatic merge might be going wrong somewhere, but I don't know exactly where. should I push the latest version so that you can have a look what went wrong? what's the best strategy?