Skip to content

init new dev area #1

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

Merged
merged 11 commits into from
Jan 7, 2017
Merged

init new dev area #1

merged 11 commits into from
Jan 7, 2017

Conversation

bewest
Copy link
Member

@bewest bewest commented Jan 6, 2017

New dev area.

This is a normal PR against the dev branch, which shows changes that are pending
release
@oskarpearson
Copy link
Contributor

Once some PRs have accumulated against the new dev area, we get ready for a release.

@oskarpearson
Copy link
Contributor

The docs in stdprojectexample say that the merge happens on the git command line; I'm going to do it as per the docs, and then merge on the UI here if required.

I'm doing things this way because that way the merge is local to my box, and if I mess something up I can reset git and get back to how things were.

@oskarpearson oskarpearson merged commit 1176c86 into master Jan 7, 2017
@bewest
Copy link
Member Author

bewest commented Jan 7, 2017

Nicely done. Regarding doing merge via commandline versus through the Github UI/PR: depending on which you do, you'll likely have to delete the inverse dev branch. Eg, if you merge through the Github UI, you might have a stale dev branch on your local box which will need to be deleted before re-creating it. Vice versa for doing it on commandline, unless dev's changes to master automatically closes the PR, you'll have to manually destroy and recreate the new dev/planning PR.

@bewest
Copy link
Member Author

bewest commented Jan 7, 2017

I've added @oskarpearson to bunch of projects on pypi (all except openaps), would prefer to do another few practice runs before doing that one.

The basic aim here is to make master the default version, to have all tags in the master branch, to make all tags match between pypi and github, and to use dev to queue up for new releases. Well done, again. :-)

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

Successfully merging this pull request may close these issues.

2 participants