search

gbv / wikidata-jskos

Access Wikidata in JSKOS format
https://coli-conc.gbv.de/services/wikidata/
MIT License
7 stars 3 forks source link

What's up with the dev branch? #62

Closed stefandesu closed 1 year ago

stefandesu commented 4 years ago

@nichtich, a while ago you apparently worked on the dev branch, but then ignored that and continued working on master. Now, the two branches are split off far enough that there will be a bunch of merge conflicts of you try to merge either way. How do we deal with this? I would like to establish here as well that we only work on dev (or in a feature branch that is merged onto dev) and then merge with master as soon as there's a release.

stefandesu commented 1 year ago

Does this mean we are abondoning the dev branch in this repository? If yes, the branch should be removed. If no, the branch should be realigned with the master branch (forced if necessary) and we should, as we do with most other repos, work primarily on the dev branch.

stefandesu commented 10 months ago

dev branch is now aligned with main again. Also added release management like in our other projects.