search

forTEXT / catma

Computer Assisted Text Markup and Analysis
https://www.catma.de
GNU General Public License v3.0
90 stars 9 forks source link

Investigate writing a custom Git merge driver for JSON files #351

Open maltem-za opened 3 weeks ago

maltem-za commented 3 weeks ago

See https://github.com/forTEXT/catma-admin-utils/commit/1bd0c4f1ff3d1791bea2253107d3778d4c02d2c4

maltem-za commented 3 weeks ago

@mpetris Did you ever consider doing something like this?

mpetris commented 3 weeks ago

No, not as a custom driver. When we still had the submodules in place we did custom conflict resolution with merging outside of git and marked the conflict solved then. But that was mostly with the submodules housekeeping files, which are in a format of their own. Our JSON might be more predictable. The references you mentioned sound promising.

maltem-za commented 2 weeks ago

@mpetris Thanks, was just wondering if it's something you maybe already looked into in the past, before I go down that rabbit hole ;) As you said though, with how it worked before it was of course a different challenge.