git-merge-driver
terminusdb
Our great sponsors
git-merge-driver | terminusdb | |
---|---|---|
2 | 51 | |
96 | 2,632 | |
- | 2.3% | |
0.0 | 8.9 | |
3 months ago | 24 days ago | |
Shell | Prolog | |
MIT License | Apache License 2.0 |
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
-
Is it possible to automate merges with folders that have known resolution paths when conflicts occur?
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?
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.
terminusdb
-
Ask HN: What is new in Algorithms / Data Structures these days?
How about some succinct data structures and delta encoding for modern databases [1]. Succinct data structures are a family of data structures which are close in size to the information theoretic minimum representation (while still being queryable).
[1] https://github.com/terminusdb/terminusdb/blob/dev/docs/white...
- TerminusDB v11 Released (temporal, Datalog graph DB
-
Datomic Is Now Free
There are already some open source alternatives to datomic. TerminusDB (https://github.com/terminusdb/terminusdb) for example is implemented in prolog (and Rust) so has the datalog variant query power that makes datomic so powerful. If you want free as in speech (thou I love free beer).
- Show HN: TerminusCMS – Headless CMS for Devs
-
Putting the Graph in GraphQL Query
You should try it out. You can either use TerminusDB by downloading it from our repositories, or you sign up for a free TerminusCMS account at dashboard.terminusdb.com.
-
Help with some python DB client installation errors please
Hey, I'm trying to install TerminusDB. They have the python client installation instructions here
-
Is there a terminusdb package?
Hi, I wanted to check if there's a NixOS package for TerminusDB
-
Rust Database - Ranking | OSS Insight
terminusdb
-
TerminusDB - Now with GraphQL
Head on over to GitHub for a full list of enhancements and bug fixes.
- TerminusDB Internals Part 2: Change Is Gonna Come
What are some alternatives?
diffsitter - A tree-sitter based AST difftool to get meaningful semantic diffs
dolt - Dolt – Git for Data
nvim-treesitter-context - Show code context
datahike - A durable Datalog implementation adaptable for distribution.
git-sqlite - A custom diff and merge driver for sqlite
nbdime - Tools for diffing and merging of Jupyter notebooks.
excel_as_code - Blog on excel as code
unison - A friendly programming language from the future
Papercups - Open-source live customer chat
structured-haskell-mode - Structured editing minor mode for Haskell in Emacs
slowbug - Slowbug is a VS Code extension for debugging your code in slow-mo!