Messy auto-merge

[turiphro]

Guys, the auto-merging system of Waliki is really a total mess. We keep getting unresolved merge conflicts every few changes. It looks like there is some weird merging policy that tries to merge starting from old commits, instead of committing to an existing branch. GIT ends up in a state detached from HEAD all the time.

Can someone explain to me how this merging system works, and how it can be fixed? This makes Waliki unusable as a wiki.

For debugging, this is a copy of the repository: https://github.com/TheThingsNetwork/wiki