Check out this pull request on 

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

The branch is all screwed up, but I like the proposal.

I'm not sure why it's showing merge conflicts. Rebasing my local branch onto main does nothing, so things should be aligned?

Hmm, does git fetch upstream main:main pull anything for you?

I just updated main, did git reset --hard origin/main on my branch, force pushed, then moved the test files and committed. This was my nuclear attack; I am officially defeated by these merge conflicts.

Also I can locally merge my branch into main without conflicts. So I'm really stumped.

The only way nuclear attack can fail is if you don't attack enough.

Do you know why the old CI runners haven't gone away? I edited .github/tests.yml to point to the right place

Ah. I think it's the way the tests are referenced in the branch rules. Probably @ricardoV94 will need to remove and readd the required tests due to the label change.

Ah. I think it's the way the tests are referenced in the branch rules. Probably @ricardoV94 will need to remove and readd the required tests due to the label change.

Right, I'll do that

Done