mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2015-07-06 18:12:18 -04:00
commit 9273ae2766
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/forum/Question:_git-annex-only_repo___63__/comment_10_ada27f7b8c7dc3c388e6c56ef095e682._comment Normal file
View file

@ -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\"...
"""]]