From b21fb6f3682bcd38890488db65e6a2a00d42ae1a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawn9JRcJ_69McoLFe5-dvTMdfS9rJpGy6JI" Date: Sat, 30 Mar 2013 00:13:29 +0000 Subject: [PATCH] Added a comment: solved the problem --- .../comment_4_e288bacdb336c4886adb6eeb4dca1e92._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/three_character_directories_created/comment_4_e288bacdb336c4886adb6eeb4dca1e92._comment diff --git a/doc/bugs/three_character_directories_created/comment_4_e288bacdb336c4886adb6eeb4dca1e92._comment b/doc/bugs/three_character_directories_created/comment_4_e288bacdb336c4886adb6eeb4dca1e92._comment new file mode 100644 index 0000000000..b7ca8bc034 --- /dev/null +++ b/doc/bugs/three_character_directories_created/comment_4_e288bacdb336c4886adb6eeb4dca1e92._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawn9JRcJ_69McoLFe5-dvTMdfS9rJpGy6JI" + nickname="Warren" + subject="solved the problem" + date="2013-03-30T00:13:29Z" + content=""" +Just wanted to let future searchers know that I solved this problem by finding the most recent commit of the master that was not merged with the git-annex branch and hard resetting to that. I hard reset the git-annex branch to its most recent separate commit and now things seem to working again. By hard reset I mean the command \"git reset --hard \". +"""]]