lawsa~/java/projects/iu/lib$ git status On branch 5-3 You are currently cherry-picking commit a37132b. (all conflicts fixed: run "git cherry-pick --continue") (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: ../build/kfs.patch renamed: casfilter-1.12.jar -> casfilter-1.16.jar lawsa~/java/projects/iu/lib$ git cherry-pick --continue error: Cannot revert during a cherry-pick error: Could not parse line 1. fatal: Unusable instruction sheet: .git/packed-refs lawsa~/java/projects/iu/lib$