[EXPERIMENTAL] merge starbase/main

[tigarmo]

This is a little experiment into the workflow of updating craft-archives with starbase's changes. Here's what I did:

• Added canonical/starbase as a remote in my local craft-archives repo (remote called starbase);
• Created this merge-starbase branch;
• Merged starbase/main into the branch with git merge starbase/main --allow-unrelated-histories;
• Commited the merge, conflicts and all.

I left the conflicts in so we can see them on the diff. From the looks of it I think most conflicts are easy to solve (for many we can just keep craft-archives' version) and they show clearly the updates in starbase that are worth bringing in.

Comments??

[tigarmo]

One consequence: As one can see from this page, all commits in starbase/main become part of craft-archives' history. Not good or bad I think, just worth pointing out. Of course, this huge number of commits is only because this is the first time this is done - future merges would have fewer commits.

[tigarmo]

Closing this experiment to do it "for real"