Hi
I have a jailbroken ATV2 5.3 with Plexconnect locally installed.
When I SSH into the ATV and try to initiate a 'git pull' for plexconnect i get the following error, anyone know how to fix?
Well, for some reason you did modify the file .gitignore... which would get overwritten while updating. Git doesn't want to get blamed for deleting your changes, so it checks back. "Stash" or cancel out your changes and git should be happy again.
To my knowledge i haven't edited that file, i haven't ever heard of it before.
Do you know where it is located?
Can i just delete it so i can update? as i don't know what to cancel out as i don't believe that i have changed it.
File should be in the main directory.
Undo your changes - e.g. see 2nd answer by Abram:
http://stackoverflow.com/questions/14075581/git-undo-all-uncommitted-changes
Or this one...
http://stackoverflow.com/questions/52704/how-do-you-discard-unstaged-changes-in-git
Sometimes google does a great job. :-D
