From 07b09bb7aaa5adf564523ad331c3d046f6883566 Mon Sep 17 00:00:00 2001 From: "boustanihani@93604388a6a2b8df16f3e34157232801a67c1021" Date: Mon, 6 Jul 2015 22:00:36 +0000 Subject: [PATCH] Added a comment --- .../comment_10_ada27f7b8c7dc3c388e6c56ef095e682._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Question:_git-annex-only_repo___63__/comment_10_ada27f7b8c7dc3c388e6c56ef095e682._comment 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 0000000000..b0fe83dd62 --- /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\"... +"""]]