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

[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?

[Giovanni]

Hi,

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

Giovanni

[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?

[Giovanni]

Hi,

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

There are also several others "unofficial".

Giovanni

[mobyfab]

It should be fixed now. In the end the repo will not change, give it another try.

[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

[mobyfab]

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.

[Jacon]

For all Github lowers:
Not funny at all...

[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