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

Github flow #51

Open
positiveblue opened this issue May 13, 2017 · 3 comments
Open

Github flow #51

positiveblue opened this issue May 13, 2017 · 3 comments

Comments

@positiveblue
Copy link

Now that more than one person is going to contribute to the project and more than one change is going to be done would be great to have a clear github-flow.

The standard in many projects is to keep two branches: Master and Development. The master is equivalent to the releases meanwhile the development goes ahead with the last stable features in the project. Each time that a functionality has to be added a new branch is created from development and they merge when the feature is working.

I have no permissions so @ondovb should create it.

Does it seem right for you?

@positiveblue positiveblue changed the title Development branch Github flow May 13, 2017
@ondovb
Copy link
Member

ondovb commented May 23, 2017

Hi Jordi,
We currently use a tagged release model rather than a stable tip, so it's fine just to have new features in master. Also on that note, do you think it would work to have a separate project for mashpy that included mash as a git submodule? As long as the API code doesn't need to modify the base mash source, I think that might be easier all around, since you wouldn't have to worry about pull requests.

@positiveblue
Copy link
Author

Hello @ondovb

There is no problem at all in having in working it in a separated repo. It is true that we do not have to worry about pull requests then but I will relay on you in modifying the C++/C API. If the idea is to have mashpy totally separated I agree on it but there are things like the CMake building process, the C++ tests, the CI Server that should be in the main project.

What do you think about me doing all this work in my own fork of the project and if we see that it is useful for the main project ending merging some of the features?

@ondovb
Copy link
Member

ondovb commented May 26, 2017

Yes, I think the fork makes sense for now, and I can merge things when I get time to look closer.

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