jsonmerge_git_merge_driver

demo custom Git merge driver to merge JSON objects (by fcostin)

Jsonmerge_git_merge_driver Alternatives

Similar projects and alternatives to jsonmerge_git_merge_driver

NOTE: The number of mentions on this list indicates mentions on common posts plus user suggested alternatives. Hence, a higher number means a better jsonmerge_git_merge_driver alternative or higher similarity.

jsonmerge_git_merge_driver reviews and mentions

Posts with mentions or reviews of jsonmerge_git_merge_driver. We have used some of these posts to build our list of alternatives and similar projects. The last one was on 2021-09-27.
  • What if Git worked with Programming Languages?
    17 projects | news.ycombinator.com | 27 Sep 2021
    I investigated the option of using a custom git merge driver for a project where we were planning to version control a bunch of data files using git.

    Here's a proof of concept python merge driver I bashed together at the time to auto-merge JSON objects: https://github.com/fcostin/jsonmerge_git_merge_driver

    This never went anywhere near production, but it was very easy to put together something basic.

    One complication with using a custom merge driver, as discussed by https://github.com/Praqma/git-merge-driver , is that they need to be configured inside the `.git/config` of the repo, which itself is not version controlled. So there's an additional config management overhead to rolling that out to everyone in a machine. Additionally, if outsourcing hosting for git repos, it may not be supported to install and configure a custom merge driver for merges conducted by the hosting platform (e.g. merges created by github.com pull request workflow).

    One idea I had at the time was using external schema files (e.g. JSON schema for JSON files) to help guide/constrain the result of the merge. I never implemented it, but it should be possible. If the schemas were also version controlled in the same git repo that stores the data, you'd need to figure out which one (and which version) to load when resolving a merge conflict of a data file. There doesn't seem to be a well-supported robust way for a merge driver script to discover the source and destination branches, but there are some potentially fragile ways of doing it that work some of the time.

Stats

Basic jsonmerge_git_merge_driver repo stats
1
0
0.0
over 2 years ago
SaaSHub - Software Alternatives and Reviews
SaaSHub helps you find the best software and product alternatives
www.saashub.com