Skip to content

Instantly share code, notes, and snippets.

@devinrhode2

devinrhode2/gitissue

Created March 5, 2012 04:54
Show Gist options
  • Save devinrhode2/1976683 to your computer and use it in GitHub Desktop.
Save devinrhode2/1976683 to your computer and use it in GitHub Desktop.
Download ZIP
git issue on nodester
Raw
gitissue
having problems with git with my node app on nodester (similar to heroku).
I did a force push to nodester, and I believe it merged my
server.js file with the starter server.js file,
resulting in an error on the <<<<<HEAD line git adds.
tried git push --force nodester master a few times, along with
git pull nodester master, and git fetch nodester master
What's more, when I do git fetch nodester master, I get:
* branch master -> FETCH_HEAD
@devinrhode2
Copy link
Author

$ git push nodester master
Nodester!
Everything up-to-date

lol.. :(

@devinrhode2
Copy link
Author

it used to complain about... something where I had to pull first (obviously) can't remember exactly

@devinrhode2
Copy link
Author

So... think I'm gonna copy out my code... delete and startup a new repo...

@devinrhode2
Copy link
Author

this stuff is strange... but I'll get it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment