[DRAFT] Dev.ej/rebase main onto ng17

ReadAlongs / Studio-Web

Suite of web packages for creating interactive ReadAlongs (this repo was formerly called Web-Component)

https://readalong-studio.mothertongues.org/

Other

9 stars 9 forks source link

[DRAFT] Dev.ej/rebase main onto ng17 #257

Closed joanise closed 5 months ago

joanise commented 5 months ago

dev.angular-migration and main have diverged enough that a simple merge is not an option anymore for #247.

This PR is meant to replace #247, by replaying the changes in main since #247 onto its branch.

A merge commit and the ours strategy will be required to merge this in, don't let the GitHub UI do the merge! And it won't anyway, because of the conflicts that it can't detect I've fixed here.

joanise commented 5 months ago

This was a worthwhile experiment, but it's a dirty solution. I'll leave it here until we review #258 but I don't want to merge this. It did help me repair the problems I had in #258, though.