Skip to content
This repository was archived by the owner on Oct 21, 2022. It is now read-only.
This repository was archived by the owner on Oct 21, 2022. It is now read-only.

Add conflict resolution system #48

@jlpatter

Description

@jlpatter

Add some way to resolve merge conflicts

Metadata

Metadata

Assignees

No one assigned

    Labels

    bigThis is a big issueenhancementNew feature or request

    Projects

    No projects

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions