Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

gave more insights about how merges should be going

  • Loading branch information...
commit 21734c3bb5e6f58f20f554665d92f3e56f4c6af6 1 parent fbcda12
@chmduquesne authored
Showing with 4 additions and 2 deletions.
  1. +4 −2
@@ -13,8 +13,10 @@ as possible a set of minimum features:
- *Conflict handling*: if the same document is modified in several places,
the system should keep both versions and yet provide a simple way to
choose between the two versions. Ideally the remote conflicting version
- should be shown as a hidden file that you can 'rm' in order to choose
- the version.
+ should be shown as a hidden file. Removing this file should resolve the
+ conflict in favor of the local version. Moving this file as the new
+ version should resolve the conflict in favor of the remote version.
+ True merges should be avoided.
- *Versioning*: It should be able to automatically keep several versions
of document.
- *Efficient storage*: Versioning must not induce a forever growing size.

0 comments on commit 21734c3

Please sign in to comment.
Something went wrong with that request. Please try again.