summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-07-06 18:12:18 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-07-06 18:12:18 -0400
commit982137ae51eb3170683b5babc183d6fa975178b7 (patch)
tree0e648a558951c2d2a01562ba46e5cd49168a192a /doc
parentb2564d9c5c8e2620e611d3f657dcae70006b9ae5 (diff)
parent1a0cf219fd5974f773b6f904fae493b576047b08 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
-rw-r--r--doc/forum/Question:_git-annex-only_repo___63__/comment_10_ada27f7b8c7dc3c388e6c56ef095e682._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_10_ada27f7b8c7dc3c388e6c56ef095e682._comment b/doc/forum/Question:_git-annex-only_repo___63__/comment_10_ada27f7b8c7dc3c388e6c56ef095e682._comment
new file mode 100644
index 000000000..b0fe83dd6
--- /dev/null
+++ b/doc/forum/Question:_git-annex-only_repo___63__/comment_10_ada27f7b8c7dc3c388e6c56ef095e682._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="boustanihani@93604388a6a2b8df16f3e34157232801a67c1021"
+ nickname="boustanihani"
+ subject="comment 10"
+ date="2015-07-06T22:00:36Z"
+ content="""
+Thanks :) Just one last question, how what happens when 2 users edit the same file in parallel, how does git-annex deal with this by default? Does the newer one overwrite the old one or do we get some info like \"unable to auto-merge\"...
+"""]]