Pushing to the remote repository fails with this error:
Jess@Tissiack:week1> git push origin master
runnojc1@vpac01.phy.vanderbilt.edu's password:
To vpac01.phy.vanderbilt.edu:/home/runnojc1/repos/ASTR8080
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'runnojc1@vpac01.phy.vanderbilt.edu:/home/runnojc1/repos/ASTR8080'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Solution: Someone has updated the remote repository since the last time you pulled it. You can issue git fetch to query the remote for the latest changes and git status to compare it to your local repository. The status message will likely tell you that you are some number of commits behind, or that you are behind and have some commits to share. Get the latest changes with git pull. You will need to merge the changes (and a message may pop up in vi or another editor, but just save and quit through it) but it should be straightforward since we all work in different directories. Now another git fetch and git status should show that you are up to date and ahead of the remote. Now git push origin master.
|
