←back to thread

Dolt is Git for Data: a SQL database that you can fork, clone, branch, merge

(github.com)
752 points crazypython | 1 comments | 06 Mar 21 21:15 UTC | HN request time: 0.236s | source
Show context
Aeolun ◴[06 Mar 21 23:04 UTC] No.26371354[source]▶
What does this look this look like when merging? Does it need a specialized tool?

I’m a bit sad it doesn’t seem to have git style syncing though.

replies(1): >>26371566 #
zachmu ◴[06 Mar 21 23:37 UTC] No.26371566[source]▶
Merge is built in, same as with git. Same syntax too:

   dolt checkout -b <branch>

   dolt merge <branch>
What do you mean git-style syncing? It has `push`, `pull`, and `fetch`.
replies(1): >>26373492 #
Aeolun ◴[07 Mar 21 05:47 UTC] No.26373492[source]▶
In regards to merging, I understand that part, but say I have a conflict, how does it get resolved. Does it open some sort of text editor where I delete the unwanted lines?

I mean, if I have a repository on one PC, I can clone from there on a different PC.

As far as I can see this only allows S3/GC or Dolthub remotes.

replies(1): >>26373614 #
1. zachmu ◴[07 Mar 21 06:14 UTC] No.26373614[source]▶
Merge conflicts get put into a special conflicts table. You have to resolve them one by one just like text conflicts from a git merge. You can do this with the command line or with SQL.

It's true we don't support SSH remotes yet. Wouldn't be too hard to add though. File an issue if this is preventing you from using the product. Or use sshfs, which is a pretty simple workaround.