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

format

Browse source
This commit is contained in:
Joey Hess 2014-07-09 14:50:42 -04:00
parent dbfab63576
commit 4915f9ad03
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/bad_merge_commit_deleting_all_files/comment_3_be42de12faf15562265ad6cf8964f5db._comment
View file

@ -4,7 +4,7 @@
subject="theory"
date="2014-07-09T18:31:07Z"
content="""
Suppose we have 2 mergeDirect's (A and B) running at the same time somehow, with B around 3 seconds behind A, and this sequence of events occurs:
Suppose we have 2 mergeDirect's A and B running at the same time somehow, with B around 3 seconds behind A, and this sequence of events occurs:
1. A copies index file to index.lock
2. A stages an empty commit