You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
The text was updated successfully, but these errors were encountered:
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.
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.
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
The text was updated successfully, but these errors were encountered: