Implement non destructive state reconciliation protocol (merging two non conflicting states, i.e. that doesn't contain mutation about the same file).
Implement non destructive state reconciliation protocol (merging two non conflicting states, i.e. that doesn't contain mutation about the same file).