Comment by gabidobocan

Collaborating on different properties of a single object is no problem; for working on the same property we don't do diff/merge yet, it's just FIFO.