File: recovery_from_failed_merge.mdwn

package info (click to toggle)
git-annex 5.20141125
  • links: PTS
  • area: main
  • in suites: jessie, jessie-kfreebsd
  • size: 37,828 kB
  • ctags: 583
  • sloc: haskell: 42,582; sh: 1,080; ansic: 498; makefile: 316; perl: 125
file content (7 lines) | stat: -rw-r--r-- 398 bytes parent folder | download | duplicates (11)
1
2
3
4
5
6
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.