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-11-14 16:21:12 +00:00 • committed by admin
parent 2a4a72cbf8
commit a5630e988b
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn
View file

@ -1,5 +1,5 @@
### Please describe the problem. ### Please describe the problem.
Minor issue. (Minor issue.)
Incorrect merge of direct repos in the special case where at repo A a symlink to a file whose contents aren't yet available, are overwritten, while at repo B the file is deleted. Incorrect merge of direct repos in the special case where at repo A a symlink to a file whose contents aren't yet available, are overwritten, while at repo B the file is deleted.