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

Select git workflow for development #11

Closed
magicDGS opened this issue Apr 20, 2018 · 4 comments
Closed

Select git workflow for development #11

magicDGS opened this issue Apr 20, 2018 · 4 comments
Milestone

Comments

@magicDGS
Copy link
Contributor

@heuermh
Copy link
Contributor

heuermh commented May 2, 2018

For Big Data Genomics organization projects, we use something like Git Feature Branch, with the following:

  • Intermediate/insignificant commits on pull request branches should be squashed
  • Pull requests are merged to master with the Github Rebase and Merge button
  • Pull request authors cannot merge their own pull requests
  • Pull requests cannot be merged until the CI build passes
  • Pull requests and commits are linked to issues whereever possible (e.g. Fixes #foo)
  • Releases use a process based on the Maven Release Plugin, which creates release tags and release branches

@magicDGS
Copy link
Contributor Author

magicDGS commented Sep 9, 2018

@heuermh - your comment in the initial code contribution about the branch from the repo instead of a fork (#14 (comment)) is related with this guidelines about the git-workflow.

Maybe we can somehow disable making branches in the repo, or enforce every commiter (including maintainers) to use their own fork. That will also keep the branchs in the repo clean and open only if necessary (e.g., master and gh-pages)

@heuermh
Copy link
Contributor

heuermh commented Sep 25, 2018

Decisions/recommendations made here should be added to CONTRIBUTING.md.

@heuermh
Copy link
Contributor

heuermh commented Mar 29, 2019

Fixed by #98

@heuermh heuermh closed this as completed Mar 29, 2019
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

2 participants