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

The fixes for #19, #20, and #21 are on Master but not on Dev #24

Open
cclauss opened this issue Mar 12, 2019 · 2 comments
Open

The fixes for #19, #20, and #21 are on Master but not on Dev #24

cclauss opened this issue Mar 12, 2019 · 2 comments

Comments

@cclauss
Copy link
Contributor

cclauss commented Mar 12, 2019

dev branch is 2 commits ahead, 3 commits behind master. This means when new PRs are made against dev they are not being merged against the bug fixes in #19, #20, and #21. The dev branch has not been updated in three years yet new PRs need to target dev branch as the standard workflow. See https://github.com/openaps/stdprojectexample and "git flow" for more details. A synchronization of dev and master is required. @bewest

@bewest
Copy link
Member

bewest commented Mar 13, 2019

FWIW, the process is designed to address feedback from FDA and others and to provide us with a working quality system. The conflict is because the process hasn't been followed. This is precisely why I setup a practice project, so that folks could learn the correct process without impacting live, production code with mistakes. I'll see about fixing this in a bit.

@cclauss
Copy link
Contributor Author

cclauss commented Mar 13, 2019

It might be useful to make dev the default branch of this repo so the natural approach for new developers would be to contribute to dev. Then the maintainer can build releases from master.

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