Skip to content

Instantly share code, notes, and snippets.

@devinrhode2

devinrhode2/gitissue

Created March 5, 2012 04:54
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save devinrhode2/1976683 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
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
@typesend
Copy link
Copy Markdown

typesend commented Mar 5, 2012

I'm not clear on what's going on, exactly. Have you manually resolved the <<<<>>> merge sections and committed again?

@devinrhode2
Copy link
Copy Markdown
Author

devinrhode2 commented Mar 5, 2012

well It's on the remote repo, so I tried pull and even pull --force, but I can't get at it.

@devinrhode2
Copy link
Copy Markdown
Author

devinrhode2 commented Mar 5, 2012

Using --force because it complains otherwise... I forgot why I had to start doing that.

@typesend
Copy link
Copy Markdown

typesend commented Mar 5, 2012 via email

@devinrhode2
Copy link
Copy Markdown
Author

devinrhode2 commented Mar 5, 2012

haha... is it actually bad when pushing to a remote, if no one else has access to it?

@typesend
Copy link
Copy Markdown

typesend commented Mar 5, 2012 via email

@devinrhode2
Copy link
Copy Markdown
Author

devinrhode2 commented Mar 5, 2012

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

lol.. :(

@devinrhode2
Copy link
Copy Markdown
Author

devinrhode2 commented Mar 5, 2012

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

@devinrhode2
Copy link
Copy Markdown
Author

devinrhode2 commented Mar 5, 2012

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

@devinrhode2
Copy link
Copy Markdown
Author

devinrhode2 commented Mar 5, 2012

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