Created
September 8, 2009 05:57
-
-
Save kevincolyar/182744 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
~/.vim[merging]% git merge akita | |
fatal: cannot read object 19084786987d7ec8d545b3608856c5e45dd5ab23 'snippets~akita': It is a submodule! | |
Merge with strategy recursive failed. | |
~/.vim[merging]% |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment