git-merge-driver VS unison

Compare git-merge-driver vs unison and see what are their differences.

git-merge-driver

Example of how to configure a custom git merge driver (by Praqma)
Our great sponsors
  • WorkOS - The modern identity platform for B2B SaaS
  • InfluxDB - Power Real-Time Data Analytics at Scale
  • SaaSHub - Software Alternatives and Reviews
git-merge-driver unison
2 17
96 5,555
- 1.4%
0.0 9.9
3 months ago 3 days ago
Shell Haskell
MIT License GNU General Public License v3.0 or later
The number of mentions indicates the total number of mentions that we've tracked plus the number of user suggested alternatives.
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.

git-merge-driver

Posts with mentions or reviews of 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.
  • Is it possible to automate merges with folders that have known resolution paths when conflicts occur?
    1 project | /r/git | 20 Mar 2023
    You could make a custom merge driver for the conflicting file: https://github.com/Praqma/git-merge-driver
  • 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.

unison

Posts with mentions or reviews of unison. We have used some of these posts to build our list of alternatives and similar projects. The last one was on 2024-02-07.

What are some alternatives?

When comparing git-merge-driver and unison you can also consider the following projects:

diffsitter - A tree-sitter based AST difftool to get meaningful semantic diffs

nvim-treesitter-context - Show code context

dark - Darklang main repo, including language, backend, and infra

git-sqlite - A custom diff and merge driver for sqlite

project-m36 - Project: M36 Relational Algebra Engine

nbdime - Tools for diffing and merging of Jupyter notebooks.

cone - Cone Programming Language

structured-haskell-mode - Structured editing minor mode for Haskell in Emacs

terminusdb - TerminusDB is a distributed database with a collaboration model