ability to merge

[wallnerryan]

Would be nice to be able to merge a branch/tree into another. E.g. merging changes into another branch. In theory, One developer is working independently from another, they can pull a dvol volume thats been pushed by another, and merge it into their own.

dvol checkout some-branch
dvol merge some-other-branch

[lukemarsden]

Merging arbitrary binary data is really hard. What happens if one user with one copy of the DB has inserted a record into a MySQL database with id 7, and another user with a different copy has inserted a different record with id 7?

As a first pass, I would just proposed to allow updating a branch B1 with new commits from remotes/B2 such that B1 contains a strict subset of the commits in remotes/B2.

[sarum90]

Another option for merging would be that you would have to have some metadata on the volume that would describe a merge policy.

Things like couchdb (http://couchdb.apache.org/) could actually perform the merge with that hook (and raise merge errors, etc.), and the default implementation could just do what luke suggests above.