search

emory-courses / computational-linguistics

Computational Linguistics.
90 stars 100 forks source link

[QZ0] push rejected #13

Closed kristinagxy closed 2 years ago

kristinagxy commented 2 years ago

Hello, when I click push there occurred an error message saying the push is rejected because remote changes need to be pushed before merging

Screen Shot 2022-01-14 at 1 32 29 AM

Here is what I got before the push. Under the push there is another choice called force push. Do I need to click force push instead of push? Thank you!!

Screen Shot 2022-01-14 at 1 33 00 AM
hxysophy commented 2 years ago

Hi, if you wish to merge the remote branch into your local branch, you could do a pull first (right click on your project folder -> Git -> Pull from main) and then push to Git. If you believe that your local branch is the most up-to-date and there's nothing from the remote branch that you want to merge, you could do a force push.

kristinagxy commented 2 years ago

Thank you!! I pushed successfully

hxysophy commented 2 years ago

Awesome! Closing this issue now.