search

geolexica / isotc211.geolexica.org

ISO/TC 211 online version of the Multi-Lingual Glossary of Terms
https://isotc211.geolexica.org
4 stars 2 forks source link

Clean up master #139

Closed skalee closed 4 years ago

skalee commented 4 years ago
  1. Disable deploys.
  2. Reset master to previous clean state.
  3. Organize recent commits in pull requests.
  4. Merge them.
  5. When all is back on master, re-enable deploys.
ronaldtse commented 4 years ago

@skalee AND GitHub has just made the branch "main" as replacement of "master". Maybe time to switch.

skalee commented 4 years ago

Personally, I perceive this naming change as a kind of BLM-washing (washing as in greenwashing).

From practical point of view, it's only a new default setting in GitHub, whereas Git conventions stay unaltered, at least for now. Executing git init in shell still creates a new repo with master branch. Also, I suppose they don't enforce these new names in any way.

That said, I am fine with any convention, as long as we're consistent throughout projects.

ronaldtse commented 4 years ago

No hurry of course. I suspect that the git implementation will adopt this convention sooner or later...

skalee commented 4 years ago

Perhaps. For now even GitHub themselves is reluctant to switch, LOL… https://github.com/github/hub, https://github.com/actions/checkout, https://github.com/github/fetch and probably more.

skalee commented 4 years ago

Clean-ups are complete, but I'm not re-enabling deploys because of #141 doubts.

skalee commented 4 years ago

Deploys are re-enabled now. #141 still needs some answers.