Development / bug fixes are on master branch but default is main

supercollider-quarks / JITLibExtensions

Some extensions to the common JITLib classes

GNU General Public License v2.0

11 stars 9 forks source link

Development / bug fixes are on master branch but default is main #24

Open bgola opened 2 years ago

bgola commented 2 years ago

Hi,

not sure if that is correct but when I install JITLibExtensions quark it will checkout the main branch but recent bug fixes and development were on master.

Probably should merge those fixes to main and remove the master branch?

LFSaw commented 2 years ago

@adcxyz is it possible to resolve this, please?

adcxyz commented 2 years ago

I merged main and master now - please test whether that solves it for you. I get the impression that existing older checkouts of JITLibExtensions may still update the checked-out master branch, while new checkouts hopefully take the main branch. no time to investigate ATM, sorry

dyfer commented 2 years ago

@adcxyz IIUC we haven't fixed SC's quarks system yet to use the default branch that's not "master". For the time being, the solution is to keep "master" up to date with "main", I'm afraid... https://github.com/supercollider/supercollider/issues/5096

adcxyz commented 2 years ago

@dyfer ok thanks for the clarification, and no problem to just keep them in sync

I was switching to "main" in order to respect the decolonializing computerese guidelines.

dyfer commented 11 months ago

The support for checking the default branch name in the repository was just merged into SuperCollider's develop branch. I'm not sure when the next release will happen, but once it does, it will use the default branch name as specified in the repo.