s9y/Serendipity — comment on commit 8df9df2183b41dee67d47b603a56f30dac8f6e99
File:  line 0
By ophian:

Well yes, I am very sorry - I am trying to find out.... this merge thing
happend because I did

$ git checkout -b 1.6 origin/1.6
Checking out files: 100% (862/862), done.
Branch 1.6 set up to track remote branch 1.6 from origin.
Switched to a new branch '1.6'

$ git cherry-pick a490e1e7a5d1789176aec0e25df6232f92a7cdf3
[1.6 a86ea14] pdo was missing a global on db_begin/end_transaction()
Author: onli <...>
2 files changed, 4 insertions(+), 0 deletions(-)

Then I forgot to make a git pull, before I did the git push, which
errored. Thats is why the merge tree happend to be, I think.

I expect the UTF8 chars came in by my Git (version 1.7.9-preview) and I
am not sure how to solve that, as I don't have a local 1.6 tree (which I
expected to have doing this first checkout command...)

Any advice...