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=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs 2014-01-01 15:54:35 +00:00 • committed by admin
parent eac7e675ea
commit 75599d8f13
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__.mdwn
View file

@ -51,3 +51,15 @@ But now I cannot sync with the remote anymore because the merge is still in proc
$ git merge --abort $ git merge --abort
fatal: This operation must be run in a work tree fatal: This operation must be run in a work tree
Update: this is running on OSX with:
git-annex version: 5.20131221-g00d1673
build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
local repository version: 3
default repository version: 3
supported repository versions: 3 5
upgrade supported from repository versions: 0 1 2 4