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

ChibiOS public support forum for all topics not covered by a specific support forum.

Moderators: utzig, lbednarz, tfAteba, barthess, RoccoMarco

ceremcem
Posts: 67
Joined: Mon Aug 10, 2015 6:57 am
Has thanked: 7 times
Been thanked: 6 times

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

Postby ceremcem » Tue Jun 04, 2019 9:54 pm

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?

User avatar
Giovanni
Site Admin
Posts: 13133
Joined: Wed May 27, 2009 8:48 am
Location: Salerno, Italy
Has thanked: 770 times
Been thanked: 653 times
Contact:

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

Postby Giovanni » Wed Jun 05, 2019 7:38 am

Hi,

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

Giovanni

ceremcem
Posts: 67
Joined: Mon Aug 10, 2015 6:57 am
Has thanked: 7 times
Been thanked: 6 times

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

Postby ceremcem » Wed Jun 05, 2019 9:50 am

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?

User avatar
Giovanni
Site Admin
Posts: 13133
Joined: Wed May 27, 2009 8:48 am
Location: Salerno, Italy
Has thanked: 770 times
Been thanked: 653 times
Contact:

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

Postby Giovanni » Wed Jun 05, 2019 10:23 am

Hi,

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

There are also several others "unofficial".

Giovanni

mobyfab
Posts: 459
Joined: Sat Nov 19, 2011 6:47 pm
Location: Versailles, France
Has thanked: 17 times
Been thanked: 24 times

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

Postby mobyfab » Thu Jun 06, 2019 3:16 am

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

ceremcem
Posts: 67
Joined: Mon Aug 10, 2015 6:57 am
Has thanked: 7 times
Been thanked: 6 times

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

Postby ceremcem » Thu Jun 06, 2019 6:46 am

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
Posts: 459
Joined: Sat Nov 19, 2011 6:47 pm
Location: Versailles, France
Has thanked: 17 times
Been thanked: 24 times

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

Postby mobyfab » Thu Jun 06, 2019 10:39 am

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.

Jacon
Posts: 139
Joined: Wed Dec 08, 2010 7:52 am
Has thanked: 41 times
Been thanked: 4 times

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

Postby Jacon » Fri Jun 07, 2019 11:53 am

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

mobyfab
Posts: 459
Joined: Sat Nov 19, 2011 6:47 pm
Location: Versailles, France
Has thanked: 17 times
Been thanked: 24 times

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

Postby mobyfab » Fri Jun 07, 2019 12:55 pm

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


Return to “General Support”

Who is online

Users browsing this forum: No registered users and 2 guests