Skip to content

Instantly share code, notes, and snippets.

@hasantayyar

hasantayyar/git-dropbox-fix.sh

Created January 9, 2014 10:19
Show Gist options
  • Star 8 You must be signed in to star a gist
  • Fork 2 You must be signed in to fork a gist
  • Save hasantayyar/8332131 to your computer and use it in GitHub Desktop.
Save hasantayyar/8332131 to your computer and use it in GitHub Desktop.
Download ZIP
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"
Raw
git-dropbox-fix.sh
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