Merging

Merging is a fact of life for most of us.  Eventually two users touch the same files and a conflict must be resolved.  For programmers merging is a daily activity, but what about the content creators? If two artists touch the same level, have your tools programmers made enough of…