Conflict between Level Blueprint and Level artist Changes...


We are currently editing blueprint level and at the same time, level artist is also amending the level by placing new objects, or modifying existing ones etc. So now this workflow is not optimal as it produces conflict ie if I edit the blueprint level at the same time with the artist and he commit it first, I will have to discard my changes. Or I can copy (Ctrl+C) the entire blueprint level, update from versioning software (which override the level and discard the blueprint level changes) and then, paste back the content. This is not very convenient work flow - is there a good one out there?