-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Split main and dev branch #142
Comments
I agree, but I do not know the exact details. I participated in a project called Dataverse. To contribute to the source you can not commit directly to the repo, you have to fork, and submitt a pull request, which the maintaners evaluate and if everything works well, they merge it to the |
The simple approach for a limited number of developers is to use the |
I made the |
Ok, here is an example: #145 but I should have created a feature-branch just for this issue. So I'm not sure whether pull requests and reviews are needed as strict rules as this is additional work for such small things (it's different for larger features, involving multiple commits). Just forced commits should be forbidden. |
I changed the settings for the branch protecting rules, now I unclicked all the checks (forced commits -- whatever it means -- are not allowed by default). |
The history looks strange. Maybe better merge without additional merge-commit as "rebase and merge" (this can be selected when merging) or with "squash and merge" (if from a feature branch, not from |
As far as I understand main can be changed only via PR issued at the Github user interface, which adds a PR related commit message, somehow hiding the original commit messages. |
Could you please suggest concrete git commands? When I use |
As discussed at <#142> to get a proper workflow for releases via main branch.
I think the trick to how to pull current state from GitHub with --rebase. It looks like having one additional merge-commit on
To simplify this, I've extended "release": [
"git checkout develop && git pull",
"@test",
"git tag $NEW_VERSION",
"git push",
... I'd prefer auto-incrementing version numbers, we can add version numbers later into this workflow to do something like:
|
* Add composer release command * Add composer release script As discussed at <#142> to get a proper workflow for releases via main branch.
squash and merge works. It did not add the "merge" commit. |
please keep and mind squash and merge can only be used when merging from a feature-branch or pull request (e.g. a throw-away branch never to be reused). I sometimes use it when testing things out locally in a temporary branch. Anyway this issue is resolved! |
* Release via composer (#154) * Add composer release command * Add composer release script As discussed at <#142> to get a proper workflow for releases via main branch. * Remove local file translate.sh * Save and show version number * composer.json: alow existing non-owned directories * Don't show frontend version if unknown * Don't show frontend version if unknown * composer: allow existing directories on install * completeness tab: add "filter" subheading * Extend German translation * completeness: don't show internal package id * completeness: don't show internal package id * Rely on PHP autoloading (#158) Requires to run 'composer update' or 'composer dump-autoload' once. * Rewrite Configuration class This fixes #161 by giving more precise error messages on invalid configuration. * Introduce basic test of configuration file This starts #143 and closes #161 (see tests/files/invalid*). * Fix typo in README * Downgrade psr/log to 1.1, because later versions requires PHP 8.x --------- Co-authored-by: Jakob Voß <voss@gbv.de>
* Release via composer (#154) * Add composer release command * Add composer release script As discussed at <#142> to get a proper workflow for releases via main branch. * Remove local file translate.sh * Save and show version number * composer.json: alow existing non-owned directories * Don't show frontend version if unknown * Don't show frontend version if unknown * composer: allow existing directories on install * completeness tab: add "filter" subheading * Extend German translation * completeness: don't show internal package id * completeness: don't show internal package id * Rely on PHP autoloading (#158) Requires to run 'composer update' or 'composer dump-autoload' once. * Rewrite Configuration class This fixes #161 by giving more precise error messages on invalid configuration. * Introduce basic test of configuration file This starts #143 and closes #161 (see tests/files/invalid*). * Fix typo in README * Downgrade psr/log to 1.1, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade doctrine/instantiator (dependency of phpunit), because later versions requires PHP 8.x * Update Biblioteca Nacional de Portugal configuration --------- Co-authored-by: Jakob Voß <voss@gbv.de>
* Release via composer (#154) * Add composer release command * Add composer release script As discussed at <#142> to get a proper workflow for releases via main branch. * Remove local file translate.sh * Save and show version number * composer.json: alow existing non-owned directories * Don't show frontend version if unknown * Don't show frontend version if unknown * composer: allow existing directories on install * completeness tab: add "filter" subheading * Extend German translation * completeness: don't show internal package id * completeness: don't show internal package id * Rely on PHP autoloading (#158) Requires to run 'composer update' or 'composer dump-autoload' once. * Rewrite Configuration class This fixes #161 by giving more precise error messages on invalid configuration. * Introduce basic test of configuration file This starts #143 and closes #161 (see tests/files/invalid*). * Fix typo in README * Downgrade psr/log to 1.1, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade doctrine/instantiator (dependency of phpunit), because later versions requires PHP 8.x * Update Biblioteca Nacional de Portugal configuration * fetch the UNIMARC Avram schema #166 * adapt data to UNIMARC #169 * adapt data to UNIMARC #169: implement human labels * adapt data to UNIMARC #169: implement human labels * adapt data to UNIMARC #169: implement human labels --------- Co-authored-by: Jakob Voß <voss@gbv.de>
* Release via composer (#154) * Add composer release command * Add composer release script As discussed at <#142> to get a proper workflow for releases via main branch. * Remove local file translate.sh * Save and show version number * composer.json: alow existing non-owned directories * Don't show frontend version if unknown * Don't show frontend version if unknown * composer: allow existing directories on install * completeness tab: add "filter" subheading * Extend German translation * completeness: don't show internal package id * completeness: don't show internal package id * Rely on PHP autoloading (#158) Requires to run 'composer update' or 'composer dump-autoload' once. * Rewrite Configuration class This fixes #161 by giving more precise error messages on invalid configuration. * Introduce basic test of configuration file This starts #143 and closes #161 (see tests/files/invalid*). * Fix typo in README * Downgrade psr/log to 1.1, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade doctrine/instantiator (dependency of phpunit), because later versions requires PHP 8.x * Update Biblioteca Nacional de Portugal configuration * fetch the UNIMARC Avram schema #166 * adapt data to UNIMARC #169 * adapt data to UNIMARC #169: implement human labels * adapt data to UNIMARC #169: implement human labels * adapt data to UNIMARC #169: implement human labels * UNIMARC: adapt completeness #168 --------- Co-authored-by: Jakob Voß <voss@gbv.de>
* Release via composer (#154) * Add composer release command * Add composer release script As discussed at <#142> to get a proper workflow for releases via main branch. * Remove local file translate.sh * Save and show version number * composer.json: alow existing non-owned directories * Don't show frontend version if unknown * Don't show frontend version if unknown * composer: allow existing directories on install * completeness tab: add "filter" subheading * Extend German translation * completeness: don't show internal package id * completeness: don't show internal package id * Rely on PHP autoloading (#158) Requires to run 'composer update' or 'composer dump-autoload' once. * Rewrite Configuration class This fixes #161 by giving more precise error messages on invalid configuration. * Introduce basic test of configuration file This starts #143 and closes #161 (see tests/files/invalid*). * Fix typo in README * Downgrade psr/log to 1.1, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade doctrine/instantiator (dependency of phpunit), because later versions requires PHP 8.x * Update Biblioteca Nacional de Portugal configuration * fetch the UNIMARC Avram schema #166 * adapt data to UNIMARC #169 * adapt data to UNIMARC #169: implement human labels * adapt data to UNIMARC #169: implement human labels * adapt data to UNIMARC #169: implement human labels * UNIMARC: adapt completeness #168 * Backport enum to PHP 7.4 * Rename utils to Utils --------- Co-authored-by: Jakob Voß <voss@gbv.de>
* Release via composer (#154) * Add composer release command * Add composer release script As discussed at <#142> to get a proper workflow for releases via main branch. * Remove local file translate.sh * Save and show version number * composer.json: alow existing non-owned directories * Don't show frontend version if unknown * Don't show frontend version if unknown * composer: allow existing directories on install * completeness tab: add "filter" subheading * Extend German translation * completeness: don't show internal package id * completeness: don't show internal package id * Rely on PHP autoloading (#158) Requires to run 'composer update' or 'composer dump-autoload' once. * Rewrite Configuration class This fixes #161 by giving more precise error messages on invalid configuration. * Introduce basic test of configuration file This starts #143 and closes #161 (see tests/files/invalid*). * Fix typo in README * Downgrade psr/log to 1.1, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade doctrine/instantiator (dependency of phpunit), because later versions requires PHP 8.x * Update Biblioteca Nacional de Portugal configuration * fetch the UNIMARC Avram schema #166 * adapt data to UNIMARC #169 * adapt data to UNIMARC #169: implement human labels * adapt data to UNIMARC #169: implement human labels * adapt data to UNIMARC #169: implement human labels * UNIMARC: adapt completeness #168 * Backport enum to PHP 7.4 * Rename utils to Utils * Backport enum to PHP 7.4 --------- Co-authored-by: Jakob Voß <voss@gbv.de>
* Release via composer (#154) * Add composer release command * Add composer release script As discussed at <#142> to get a proper workflow for releases via main branch. * Remove local file translate.sh * Save and show version number * composer.json: alow existing non-owned directories * Don't show frontend version if unknown * Don't show frontend version if unknown * composer: allow existing directories on install * completeness tab: add "filter" subheading * Extend German translation * completeness: don't show internal package id * completeness: don't show internal package id * Rely on PHP autoloading (#158) Requires to run 'composer update' or 'composer dump-autoload' once. * Rewrite Configuration class This fixes #161 by giving more precise error messages on invalid configuration. * Introduce basic test of configuration file This starts #143 and closes #161 (see tests/files/invalid*). * Fix typo in README * Downgrade psr/log to 1.1, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade phpunit to 9.6, because later versions requires PHP 8.x * Downgrade doctrine/instantiator (dependency of phpunit), because later versions requires PHP 8.x * Update Biblioteca Nacional de Portugal configuration * fetch the UNIMARC Avram schema #166 * adapt data to UNIMARC #169 * adapt data to UNIMARC #169: implement human labels * adapt data to UNIMARC #169: implement human labels * adapt data to UNIMARC #169: implement human labels * UNIMARC: adapt completeness #168 * Backport enum to PHP 7.4 * Rename utils to Utils * Backport enum to PHP 7.4 * Backport enum to PHP 7.4 * Backport enum to PHP 7.4 --------- Co-authored-by: Jakob Voß <voss@gbv.de>
Current development is all on the main branch, leading to several instable commits. Latest stable version of our installation is 5d4b558 but I did breaking commits to the main branch in the past. Development should be moved to a
dev
branch which is merged intomain
only after testing the new feature. Themain
branch should further be secured against manual commits.The text was updated successfully, but these errors were encountered: