search

UniversityRadioYork / MyRadio

University Radio York's back-end radio management system
https://ury.org.uk/myradio
16 stars 16 forks source link

merge from master to be in line with it #1162

Closed hitime1234 closed 2 months ago

ashhhleyyy commented 2 months ago

you should make a new branch rather than merging main back into yours, it creates a messy history with lots of back-and-forth merging

hitime1234 commented 2 months ago

ah do you want me yeet the current commit and pull it back into a new rens dev