This raises an exception when the merge would have lost data, which should never happen - it can conflict and the resolution can nuke data, but the merge itself shouldn't remove anything.
I also internally renamed "ours" and "their" to "left" and "right" as "ours" and "their" makes no sense to me, but "left" and "right" does. I didn't change the API in this pull though (the conflict hash that is exposed still uses ours and their) - that would be a bigger change than what I want to do now.
This raises an exception when the merge would have lost data, which should never happen - it can conflict and the resolution can nuke data, but the merge itself shouldn't remove anything.
I also internally renamed "ours" and "their" to "left" and "right" as "ours" and "their" makes no sense to me, but "left" and "right" does. I didn't change the API in this pull though (the conflict hash that is exposed still uses ours and their) - that would be a bigger change than what I want to do now.