diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs <Xinruo@web> | 2014-01-01 15:54:35 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-01-01 15:54:35 +0000 |
| commit | dba570c5ee4c8f107ff1cf83d265e4c20e47036a (patch) | |
| tree | 281a7defa1b736b1298b9dcb62ba21c688d23eee /doc | |
| parent | 800988d1ccf9701386f05a984de1f421fa8a1345 (diff) | |
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__.mdwn | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__.mdwn b/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__.mdwn index b70340f27..a21d6d6d2 100644 --- a/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__.mdwn +++ b/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__.mdwn @@ -51,3 +51,15 @@ But now I cannot sync with the remote anymore because the merge is still in proc $ git merge --abort 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 + |