Submodule update in github

For test results, bug reports, announcements of new builds etc.

Moderators: winston, another_commander, Getafix

Post Reply
User avatar
phkb
Impressively Grand Sub-Admiral
Impressively Grand Sub-Admiral
Posts: 4830
Joined: Tue Jan 21, 2014 10:37 pm
Location: Writing more OXPs, because the world needs more OXPs.

Submodule update in github

Post by phkb »

Apologies for this, but I really can't see how to fix what I've done.

So, I committed the updated bitmaps to the oolite-binary-resources submodule, which, when I go straight to the project, appear to have been added fine, as can be seen here: https://github.com/OoliteProject/oolite-binary-resources.

However, the main project hasn't picked up this update. It's pointing to the previous update, as can bee seen here: https://github.com/OoliteProject/oolite-binary-resources/tree/24c0fa5bea156f251d3d821d246e94fe71819d79

And for the life of me, I can't (a) figure out what I've done wrong, and (b) how to fix it. I assume the fix is to get the main oolite project to pick up the most recent check-in, but I'm at a loss as to how to achieve that.

Once again, apologies for messing this up (one could possibly add "again"!).
User avatar
phkb
Impressively Grand Sub-Admiral
Impressively Grand Sub-Admiral
Posts: 4830
Joined: Tue Jan 21, 2014 10:37 pm
Location: Writing more OXPs, because the world needs more OXPs.

Re: Submodule update in github

Post by phkb »

Ummm... I *think* I've fixed it. Maybe. It looks OK to me, but maybe someone could have a quick look and tell me if I've done the right thing or not.
User avatar
hiran
Theorethicist
Posts: 2403
Joined: Fri Mar 26, 2021 1:39 pm
Location: a parallel world I created for myself. Some call it a singularity...

Re: Submodule update in github

Post by hiran »

In this thread I updated some submodule and also did not know exactly what I was doing:
https://bb.oolite.space/viewtopic.php?f= ... lit=script

Since I also needed help here is how we resolved it:
https://bb.oolite.space/viewtopic.php?p=290007#p290007

It seems not everybody is easy with the method. Hence let's add the information to
https://wiki.alioth.net/index.php/Developer%27s_Corner
Sunshine - Moonlight - Good Times - Oolite
Post Reply