Version control: merge conflicts

brain-bican / taxonomy-development-tools

Tools to build and edit Cell Annotation Schema taxonomies.

Apache License 2.0

3 stars 1 forks source link

Closed hkir-dev closed 4 months ago

hkir-dev commented 1 year ago

Add actions to manage merge conflicts and optionally utilise a tabular diff tool.