summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Frank2 <Frank2@web>2014-06-14 22:25:25 +0000
committerGravatar admin <admin@branchable.com>2014-06-14 22:25:25 +0000
commit72a2e65eeb929ca4ca15bf0303e7d7ccf71fb796 (patch)
tree385f4512ac81b40635c3721be1214334f7e2b808
parentfbf780d836206d1e27e9ab905214885c066824d8 (diff)
-rw-r--r--doc/forum/recovery_from_failed_merge.mdwn7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/forum/recovery_from_failed_merge.mdwn b/doc/forum/recovery_from_failed_merge.mdwn
new file mode 100644
index 000000000..802c66e51
--- /dev/null
+++ b/doc/forum/recovery_from_failed_merge.mdwn
@@ -0,0 +1,7 @@
+Starting the assistant version 5.20140613 on my repository (~60GB), it performed a merge
+with an offline-repository, deleting a large part of the files.
+Since the repo is in direct mode, I cannot do a git revert. The other repo is not available anymore
+
+Any way of getting them back?
+Also, du shows me that the .git/annex/objects folder has approximately the size of my repo before the incident.
+