Conversation
|
@NSoiffer I want to do a second change that may or may not lead to a merge conflict with this one (another small UX improvement). What is the right way to handle this? should I branch of from this branch locally and make another PR directly, or first check locally if the can be resolved, or is there a good way to have like nested PRs in GitHub? I'm not that savvy with Git/GitHub, so I'd have to look into this in more detail to have an informed opinion. |
|
I'm not savvy with GitHub either. My guess is that you should be able to tell locally whether there is a problem by making sure your files are up to date. |
hm ok. just did that, this PR is also good to go. and good to see that the python tests finished in 9 seconds. |

Marthe requested if we could order by line-number instead of alphabetically, which I think makes a lot of sense.
side note: we could add
uv run pytest(called inside PythonScripts) to CI.how does GitHub Actions work with dependency tools like
cargo/uv? Iscargo buildrun from scratch every time before testing? looks like it to me (https://github.com/daisy/MathCAT/actions/runs/22022276872/job/63633257352?pr=488). should we look into caching some of this to not run into any limits?