CODEWITHSUNDEEP
git
Devin Rhode
Devin Rhode

Reputation: 25377

Git: Can't make changes to remote

I searched a good bit, have been asking peers for help, but I can't get this issue with git straight.

Essentially I edit, commit the edit, and push (or pull and push) and I get this error at the end of the push succeeding:

remote: A   views/search.jade
remtoe: A   ...more code files...
remote: Pull is not possible because you have unmerged files. <- But it's the remote     repo.. can't do this.

...then the host nodester successfully restarts the app...
\m/ Nodester out \m/

The changes are not reflected in the site.

Here is a gist of me creating a repo from scratch, and pushing to the repo, with all the commands I ran leading to the error: https://gist.github.com/1980376

Upvotes: 1

Views: 86

Answers (1)

manojlds
manojlds

Reputation: 301527

There is a post-receive hook on the repo you are pushing to and that hook is cd'ing into your application path and doing a pull on another clone of your repo and this latter repo is having unmerged entries in it.

Fix the unmerged entries (git reset --hard to blow them away), or fix the hook - your application should not be deployed from a repo working directory.

Upvotes: 1

Related Questions