Skip to content
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

Describe repository rules and guideliness #10

Open
1 task done
bitphage opened this issue Mar 21, 2018 · 1 comment
Open
1 task done

Describe repository rules and guideliness #10

bitphage opened this issue Mar 21, 2018 · 1 comment

Comments

@bitphage
Copy link
Member

bitphage commented Mar 21, 2018

Write CONTRIBUTING section or separate document with description how developers should provide contributions.

  • No force push allowed to master and release branches
  • Perform your work in feature branches. Before creating a PR, rebase your changes on top of the base branch. History in the base branch thus should be fast-forward
  • Branch naming for features and fixes should be in viz-000-description format, where 000 is an issue id
  • "Release branch" is a branch where PRs from tip branches are going, for example viz-v0.19. When code is ready for release, a tag objects should be created pointing to a commit in release branch
  • Releases must contain previous tag in their history to preserve consistency
  • Avoid direct commits into master and release branches. Use PRs instead which must be approved by another commiter
  • Delete original branches and tags (except ones we will use as starting point)
@bitphage
Copy link
Member Author

bitphage commented Apr 4, 2018

http://www.jillesvangurp.com/2011/07/16/using-git-and-feature-branches-effectively/

About branching. Actually, we can avoid using master and release branches together for now. We can have master only and feature branches for single features development.

For the feature:

  • master is for Continuous Development and Integration
  • release branch can be created to follow feature freeze (while master can be used for the futher development)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant