Page 1 of 1

Git refuses to merge unrelated histories on branch stable_18.2.x

Posted: Tue Jun 04, 2019 9:54 pm
by ceremcem
Hi,

My latest commit on the PC is 5b8695ccb and when I try to update with `git pull upstream stable_18.2.x`, I receive the following error:

Code: Select all

fatal: refusing to merge unrelated histories


What is going on?

Re: Git refuses to merge unrelated histories on branch stable_18.2.x

Posted: Wed Jun 05, 2019 7:38 am
by Giovanni
Hi,

No idea, I have not a good relationship with git :) Make sure to pm the git mirror owner.

Giovanni

Re: Git refuses to merge unrelated histories on branch stable_18.2.x

Posted: Wed Jun 05, 2019 9:50 am
by ceremcem
Wow! Apparently the upstream repo that I've cloned was moved to https://github.com/ChibiOS/ChibiOS-Old and had been archived. There is a brand new repo pushed to the https://github.com/ChibiOS/ChibiOS location.

Why is this happened? Who is managing the Github mirror?

Re: Git refuses to merge unrelated histories on branch stable_18.2.x

Posted: Wed Jun 05, 2019 10:23 am
by Giovanni
Hi,

Mobyfab is taking care of it: viewtopic.php?f=3&t=5036

There are also several others "unofficial".

Giovanni

Re: Git refuses to merge unrelated histories on branch stable_18.2.x  Topic is solved

Posted: Thu Jun 06, 2019 3:16 am
by mobyfab
It should be fixed now. In the end the repo will not change, give it another try.

Re: Git refuses to merge unrelated histories on branch stable_18.2.x

Posted: Thu Jun 06, 2019 6:46 am
by ceremcem
Very nice! Now my existing git clone can sync with current (new) Github repo. Thank you.

If you could explain the steps, it would be also useful for the future operations: https://superuser.com/q/1445182/187576

Re: Git refuses to merge unrelated histories on branch stable_18.2.x

Posted: Thu Jun 06, 2019 10:39 am
by mobyfab
ceremcem wrote:Very nice! Now my existing git clone can sync with current (new) Github repo. Thank you.

If you could explain the steps, it would be also useful for the future operations: https://superuser.com/q/1445182/187576


I've put the scripts here:
https://github.com/ChibiOS/maintenance

In the end I created an SVN mirror on AWS in Tokyo (since the repo is hosted in Japan) then transferred everything back to my main VM.

Re: Git refuses to merge unrelated histories on branch stable_18.2.x

Posted: Fri Jun 07, 2019 11:53 am
by Jacon
For all Github lowers:
Not funny at all...

Re: Git refuses to merge unrelated histories on branch stable_18.2.x

Posted: Fri Jun 07, 2019 12:55 pm
by mobyfab
So?

Unlike svn git is distributed so he still has all the code history, which he can host anywhere. GH restored his account anyway.
Please don't post off-topic stuff.

Thanks