Created
January 9, 2014 10:19
-
-
Save hasantayyar/8332131 to your computer and use it in GitHub Desktop.
Solution if you are using dropbox and git same time and if you get this error "fatal: Reference has invalid format: refs/heads/master conflicted copy"
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
find . -type f -name "* conflicted copy*" -exec rm -f {} \; | |
awk '!/conflicted/' .git/packed-refs > temp && mv temp .git/packed-refs |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment