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

Browse source
This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg 2013-10-13 08:56:02 +00:00 committed by admin
parent 8a03566099
commit 1d4f1d5170
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/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos.mdwn
View file

@ -1,7 +1,7 @@
### Please describe the problem. ### Please describe the problem.
Data loss due to incorrect merge of repos in direct mode. Data loss due to incorrect merge of repos in direct mode.
Given 2 repos A and B, in direct mode, where a has no remotes and b has a as remote (not sure if the latter is relevant): Given 2 repos A and B, in direct mode:
1. in A: mkdir f, with a file f in it 1. in A: mkdir f, with a file f in it
2. in B: touch f 2. in B: touch f
3. in B: sync 3. in B: sync