Sync stable

richard · January 31, 2024, 10:48pm

Now that 3.2 is out, can the stable tag/branch be synced with main please?

merefield · February 1, 2024, 8:28am

Looking at this now …

merefield · February 1, 2024, 8:33am

That’s done @richard, can you please perform a checkout at your convenience?

richard · February 1, 2024, 9:20am

So main and stable should be the same now right?

merefield · February 1, 2024, 9:26am

No, it was a merge, so things may not look the same commit wise.

richard · February 1, 2024, 9:55am

The file contents are different as well.

merefield · February 1, 2024, 10:45am

there are only two files that are different.

it might make more sense to sync those files?

What this suggests is someone made some kind of manual change in stable after an update in main.

merefield · February 1, 2024, 10:57am

OK @richard that is done, the branches look identical now apart from history (not the best I admit, but all I did was a direct merge)