Hi,
This information targets all users with commit privileges to the official x2go repositories.
Coming up soon™, new branching policies will be in effect.
TLDR:
DO:
- create feature branches as "feature/<name>"
- comment on need for "bugfix/<name>" branches
- rebase your feature branches against master
- only send "pull requests" for your feature branches once they have been rebased - NO MERGE CONFLICTS!
- send emails to git-admin@x2go.org for branch deletion, renaming or "pull requests"
DON'T:
- be afraid to make mistakes on your feature branches or ask
- try to rebase or merge other branches into master (will be rejected)
- try to delete branches (will be rejected)
- try to rename branches (might leave you with a mess)
Details:
Historically, non-fast-forward (created by the rebase operation) and merge commits have been rejected on all branches. These restrictions will be loosened to allow committers more control over their branches and ease merging of pull requests.
The new policies will allow non-fast-forwards and merge commits within feature branches. That means developers will be able to to rebase and merge other branches.
In fact, committers will be required to rebase their feature branch against the master branch for pull requests. Requests with conflicts will not be merged.
This new concept will not affect master and release/* branches. On these branches, rebases and merges will still be rejected.
Feature branches should follow the template feature/<name> to ensure consistency with our current release/<version> release branches.
The current branches will be accordingly renamed once the new policy is in effect.
If you do see any benefit of a new branch type, like bugfix/<name> or bugfix/<version>, please let me know. We can then discuss policies regarding those. For now, please refrain from creating these branches.
Please send an email to git-admin@x2go.org to initiate a pull request. Don't forget to mention the branch you want to have merged into master. The admin will review and then either merge or deny your request.
This said, please try to refrain from uselessly rebasing your branches to delete mistakes or squish commits together, unless it really makes sense. Don't be afraid to be human. Commit early, commit often. Don't forge the history.
For renaming and deletion of branches, please also contact git-admin@x2go.org. Creation is possible without former notification of git-admin, but please make sure to follow naming conventions as outlined in this email.
The new policies will be effective once implemented and Mike#1 finishes the outstanding release of all components.
Best
Mihai
Hi,
I am pleased to let you know, that the new branching concept will be effective starting now.
I have reworked the git hooks and changed the repositories accordingly.
Additionally, the git hooks are now available publicly from
http://code.x2go.org/gitweb?p=maintenancescripts.git;a=tree;f=git/hooks
As the only deviation from the previously proposed changes, "bugfix/<name>" branches will now also be allowed and handled like "feature/" branches (that is, full control by the author.)
Two currently non-public scripts for git repository creation will need to be reworked and also put into the maintenancescripts repository. This is non-critical at the moment, though, as new repositories are to be created through me and I'm aware of the one quirk regarding the reworked git hooks. I'll work on this shortly and update the list accordingly.
Mihai
Hi,
I have reworked the two previously non-public scripts for git repository creation and stored them into the maintenancescripts git repository.
Hooks are now handled via symlinks to a shared directory for newly created repositories. This now matches the manual changes I have performed to the hooking mechanism two weeks ago.
Mihai
-
Mihai Moldovan