diff options
| author |  olaf <olaf@web> | 2017-08-23 05:47:39 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2017-08-23 05:47:39 +0000 |
| commit | 738d400b4fab4d8c0a885c4ebd3edb545dfe400b (patch) | |
| tree | c61962844cc245ae344ce4265242ab4ac5279bf3 /doc/bugs | |
| parent | 71e459cb1a8ee0abf9f05d2f59ff096aca64e49f (diff) | |
Diffstat (limited to 'doc/bugs')
| -rw-r--r-- | doc/bugs/Assistant_deleted_file_when_merging___40__another_report__41__.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
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 c8202ff8d..9b40fa386 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` |