Created
March 5, 2012 04:54
-
-
Save devinrhode2/1976683 to your computer and use it in GitHub Desktop.
git issue on nodester
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
| 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 |
well It's on the remote repo, so I tried pull and even pull --force, but I can't get at it.
Using --force because it complains otherwise... I forgot why I had to start doing that.
Stop that shit. You'll turn into a sith lord.
Also, I am person #1 to register early for MinneBar.
…On Sun, Mar 4, 2012 at 11:22 PM, Devin Rhode < ***@***.*** > wrote:
Using --force because it complains otherwise... I forgot why I had to
start doing that.
---
Reply to this email directly or view it on GitHub:
https://gist.github.com/1976683
haha... is it actually bad when pushing to a remote, if no one else has access to it?
Well obviously you just broke it…so yeah, I'm thinking: yes.
There should be no reason to have to do that. What does it scream at you
when you don't use the --force?
…On Sun, Mar 4, 2012 at 11:30 PM, Devin Rhode < ***@***.*** > wrote:
haha... is it actually bad when pushing to a remote, if no one else has
access to it?
---
Reply to this email directly or view it on GitHub:
https://gist.github.com/1976683
$ git push nodester master
Nodester!
Everything up-to-date
lol.. :(
it used to complain about... something where I had to pull first (obviously) can't remember exactly
So... think I'm gonna copy out my code... delete and startup a new repo...
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
I'm not clear on what's going on, exactly. Have you manually resolved the <<<<>>> merge sections and committed again?