search

cmm-21 / a5

0 stars 0 forks source link

"Your branch and 'origin/main' have diverged" #27

Open swellsc opened 3 years ago

swellsc commented 3 years ago

Hi, I'm getting this issue when trying to commit my code: On branch main Your branch and 'origin/main' have diverged, and have 7 and 1 different commits each, respectively. (use "git pull" to merge the remote branch into yours) ever since I followed the instructions fo the updated collision code: git remote add origin-start-code https://github.com/cmm-21/a5.git git pull origin-start-code main --rebase

I'm quite new to github so I'm a bit confused about how to proceed. I am worried that merging the remote branch into mine will revert changes, so I would really appreciate some instruction on what I should do... Thanks a lot!

swellsc commented 3 years ago

I have tried different solutions for this and none of them have worked:

(base) iSupi:a5-swellsc sandra$ git rebase origin/main
error: cannot rebase: You have unstaged changes.
error: Please commit or stash them.

(base) iSupi:a5-swellsc sandra$ git merge origin/main
fatal: refusing to merge unrelated histories

(base) iSupi:a5-swellsc sandra$ git pull
fatal: refusing to merge unrelated histories
vanie28 commented 2 years ago

Meme probleme et je cherche la solution...