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

Repository workflow #58

Open
cwmyers opened this issue Apr 25, 2016 · 1 comment
Open

Repository workflow #58

cwmyers opened this issue Apr 25, 2016 · 1 comment

Comments

@cwmyers
Copy link
Collaborator

cwmyers commented Apr 25, 2016

Hi Jakob (and everyone),

Up until now I have used the git-flow workflow to manage the development and release of monet. I've had a long running master and develop branches and short lived "feature" branches. Feature branches would get merged into develop and once develop was stable I would merge it into master and do a release from there.

I am happy to review this workflow. I think it's a bit confusing for the community to know which branch to send their PRs to. I'm considering retiring the develop branch permanently.

What do you think?

@ulfryk
Copy link
Member

ulfryk commented Apr 26, 2016

Actually I have also started using git-flow here… Nad as maybe it's not the best (I prefer gerrit workflow, which is sadly even more confusing for open source community), but it's known to many GitHub users.

I'd suggest adding proper and well written CONTRIBUTING.md with information about master and develop branches role in project and.

The other possible way is using git-flow with other branches - master for development (role of current develop) and release for releases and hot-fixes (role of current master). But this style is not so common…

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