search

marclos / UAV

Research and Teaching with UAVs
0 stars 1 forks source link

Changes won't push #2

Closed aburns2293 closed 4 years ago

aburns2293 commented 4 years ago

When I try to push, I get the error "error: failed to push some refs to 'github.com:marclos/UAV.git'. Updates were rejected because the tip of your current branch is behind its remote counterpart. Integrate the remote changes (e.g. 'git pull ...') before pushing again. See the 'Note about fast-forwards' in 'git push --help' for details."

I visited the error page, and went into the git shell and used the commands they suggested; "git fetch origin" worked, but when I tried "git merge origin master" it returned "unlink of file 'Hardware/Raspberry_Pi/Raspberry_Pi_Guide.pdf' failed. Should I try again (y/n)?".

I'm stuck.

aburns2293 commented 4 years ago

https://help.github.com/en/github/using-git/dealing-with-non-fast-forward-errors

https://help.github.com/en/github/using-git/getting-changes-from-a-remote-repository

Two information sources I used.

aburns2293 commented 4 years ago

Needed to merge commits, and close a copy of the pdf output in another tab. Problem solved!