Board Thread:Administrative/@comment-10473115-20150722230424/@comment-100066-20150725191842

Merging really doesn't work well. It is almost impossible to automate it. Merges usually have to be done manually and you do lose some edit history. It is unfortunate, but there isn't really a way around it.