simularium / simularium-website

Front end website for the Simularium project, includes the Simularium viewer
https://simularium.allencell.org
Apache License 2.0
6 stars 3 forks source link

autoconversion branch diff comparison #491

Closed interim17 closed 4 months ago

interim17 commented 5 months ago

Here at the 11th hour, it seems we won't actually be merging the 346 feature branch directly into main, because it has a stale diff and shows a cached version of main that I think dates back to when 346 was started.

This PR can serve two purposes: you can look at this diff to see the in fact the two branches, feature/autoconversion and 346-implement-production-autoconversion-ui are functionally identical, that way if you approve merging feature/autoconversion into main you know that you aren't sending in unreviewed code!

Alternately, we can actually merge these changes into the 346 so that the two branches are truly identical.

All of these changes are essentially "merge main" changes that simplify the diff when bringing the feature branch into main, not functional changes.

Let's never have another feature branch live this long.