diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8 <daniele@web> | 2014-07-18 15:01:01 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-07-18 15:01:01 +0000 |
| commit | 041e2b2517aadba701ef4cd742b4bf33c056d774 (patch) | |
| tree | 47359ce2cafe24c6e0bf6d99005a7c5902635678 /doc/bugs/git_annex_still_deleting_content_when_merging.mdwn | |
| parent | cac81b9a5becfde0b28db15c5edc70972dd64a55 (diff) | |
typo
Diffstat (limited to 'doc/bugs/git_annex_still_deleting_content_when_merging.mdwn')
| -rw-r--r-- | doc/bugs/git_annex_still_deleting_content_when_merging.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn b/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn index e8cd5dbca..dddef7b36 100644 --- a/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn +++ b/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn @@ -6,7 +6,7 @@ I should also add that I don't know much about git log history and git-annex inn **Bug description:** -Two local computers, running Ubuntu-14.04 and Fedora-20 respectively, are paired through the assistant and functional with git annex 5.20140709. In direct mode. Most of the time, everything seems to work fine. Sometimes, *Computer A* will modify one file in its repository while the *B* is offline. When *B* comes back online both repositories will lose their copy of the modified file (I'm not sure whether this also happens when they're both online when the change happens; it doesn't look like it anyway). The rest of the data in the repository is intact. This does not happen every time and I haven't been able to reproduce it consistently. Since 5.20140709 came out, it happened 2 or 3 times. +Two local computers, running Ubuntu-14.04 and Fedora-20 respectively, are paired through the assistant and functional with git annex 5.20140709. In direct mode. Most of the time, everything seems to work fine. Sometimes, *Computer A* will modify one file in its repository while *B* is offline. When *B* comes back online both repositories will lose their copy of the modified file (I'm not sure whether this also happens when they're both online when the change happens; it doesn't look like it anyway). The rest of the data in the repository is intact. This does not happen every time and I haven't been able to reproduce it consistently. Since 5.20140709 came out, it happened 2 or 3 times. Looking at 'git log --stat' in *B*: |