diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2014-01-02 02:05:06 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-01-02 02:05:06 +0000 |
| commit | 33e5339ae3c63f4d8379b3eaf678632fc0be673c (patch) | |
| tree | 134bef0c1409f716ebb7d6bb7001d5a308b15e56 | |
| parent | ae3837431df9404dc70e3a73855c25aa71d2b1de (diff) | |
Added a comment
| -rw-r--r-- | doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_3_93f20519483837c59a75821621e22dee._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_3_93f20519483837c59a75821621e22dee._comment b/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_3_93f20519483837c59a75821621e22dee._comment new file mode 100644 index 000000000..7cfc2a7f2 --- /dev/null +++ b/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_3_93f20519483837c59a75821621e22dee._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.227" + subject="comment 3" + date="2014-01-02T02:05:05Z" + content=""" +AFAICS, git-merge was still running when you ctrl-c'd it. So this is coming before git-annex processes the merge to update the work tree. + +I don't know why it would take so long to run, especially if it was not using CPU or disk. You might try to reproduce the problem, passing --debug to git-annex, and perhaps strace the git-merge process to see what it's doing. +"""]] |