Closed sdumetz closed 8 months ago
see #47 for context.
This implementation should be transparent in most cases, handle simple merges automatically and NOT break the scenes too much on unresolved three-way merges.
see #47 for context.
This implementation should be transparent in most cases, handle simple merges automatically and NOT break the scenes too much on unresolved three-way merges.