search

cfss-su19 / hw01

0 stars 16 forks source link

another issue committing to GitHub #6

Open warrenepstein opened 5 years ago

warrenepstein commented 5 years ago

This is the error I am getting

>>> git push origin refs/heads/master To https://github.com/warrenepstein/hw01.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://github.com/warrenepstein/hw01.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

warrenepstein commented 5 years ago

and I get this error when I try to pull

>>> git pull error: Your local changes to the following files would be overwritten by merge: README.md

bensoltoff commented 5 years ago

This is a merge conflict. At some point, you created a commit on GitHub that doesn't exist on your local copy on your computer. You need to resolve the conflict in order to merge the different versions of the repo. If you come to class a bit early tomorrow I can try and help you resolve it - it's a bit complicated to explain here.