diff --git a/README.md b/README.md index 4750468..9025335 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # masscode_merge -##### Utility to merge massCode snippet databases - - +### Utility to merge massCode snippet databases [massCode](https://masscode.io/), a cross-platform snippet manager, currently doesn't have native support for merging separate snippet databases. @@ -10,20 +8,12 @@ I needed to merge databases from my Mac and PC into a new unified database. So, `masscode_merge` was born. -<<<<<<< HEAD masscode_merge processes both db files, and merges then into a single db file, preserving folder structures, including nested folders, while avoiding duplicates. -======= -masscode_merge processes two distinct db files, and merges then into a single db file preserving folder structures, including nested folders. ->>>>>>> 710b8c57909c3ef847b2e978ba0f379effeaf56a - - It is coded in [BCX](https://bcxbasiccoders.com/), which is a Basic to C/C++ transpiler, and uses the [Parson](https://github.com/kgabis/parson) json library. It is currently Windows-only, but Linux and macOS versions are being worked on. - - ### How to use, once compiled Usage: merge_masscode.exe