Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
If I do
git checkout master
git push
I get
Everything up-to-date
If I go
git pull
I get
Already up-to-date.
If I ssh to my server remotely and I do:
git status
I get:
On branch master
nothing to commit (working directory clean)
However, the truth is, I DO have a different version of a file locally when compared with the remote one.
How can I solve this, in order to place my local file into the master remote branch ?
That means that you did everything correctly on your local machine. You commited the changes correctly, and you pushed it correctly. The not working thing is where changes go from the central (bare) repository, to the other (non-bare) repository with the working directory. You said that a hook is resposible for that, so that does not seem to work.