Open as6325400 opened 2 months ago
Hi,
I think the rebasing still didn't work correctly, for example https://github.com/DOMjudge/domjudge/pull/2720/commits/92e3ad705cef4b6e4db2033751384327437e4a9a should stay specific for the 8.3 branch.
Can you run:
git remote add upstream https://github.com/DOMjudge/domjudge
git fetch upstream
git rebase -i upstream/main
And only use your own commits there? Alternatively you enabled the option that we can do this, if you want I can try it later this week if you're fine with it.
Hi,
I think the rebasing still didn't work correctly, for example 92e3ad7 should stay specific for the 8.3 branch.
Can you run:
git remote add upstream https://github.com/DOMjudge/domjudge git fetch upstream git rebase -i upstream/main
And only use your own commits there? Alternatively you enabled the option that we can do this, if you want I can try it later this week if you're fine with it.
I think I've got it right now. Could you please take a look?
Thanks!
I have mostly finished the modifications as mentioned above. Is there anything else that needs to be changed? Thank you.
I found the issue and successfully passed the unit tests.
Can you already squash?
Can you already squash?
ok
Can you already squash?
Ok, I already squashed it
I think implementing the required restriction in the backend can be done in the next PR, as it's more general. Including it in this commit would make things confusing.
Sorry to bother you, but I was wondering if there are any improvements needed for this?
Once this is merged, I should be able to work on the issue of replacing it with Monaco.
Sorry to bother you, but I was wondering if there are any improvements needed for this?
Once this is merged, I should be able to work on the issue of replacing it with Monaco.
I think you should address @eldering his question, and we should address some of your questions still.
Modify PR merge to main
add Paste code to submit feature