From 3730f9ae857cb2b9d29d2c1698510506392e2bf0 Mon Sep 17 00:00:00 2001 From: olaf Date: Wed, 23 Aug 2017 05:47:39 +0000 Subject: [PATCH] --- ...nt_deleted_file_when_merging___40__another_report__41__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/Assistant_deleted_file_when_merging___40__another_report__41__.mdwn b/doc/bugs/Assistant_deleted_file_when_merging___40__another_report__41__.mdwn index c8202ff8d2..9b40fa3869 100644 --- a/doc/bugs/Assistant_deleted_file_when_merging___40__another_report__41__.mdwn +++ b/doc/bugs/Assistant_deleted_file_when_merging___40__another_report__41__.mdwn @@ -1,5 +1,5 @@ ### Please describe the problem. -A couple of days ago I merged a v5 repo with an OLD one (see [1]). I *thought* it all went relatively smoothly until I tried to find some files that existed pre-merge. +A couple of days ago I merged a v5 repo with an OLD one (see [1]) - both on the local drive. I *thought* it all went relatively smoothly until I tried to find some files that existed pre-merge. **All** files from before the merge were deleted as part of the merge commit. Fortunately, they seem to be available when I do `git annex unused`