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

Clarification over branches #726

Closed
kpfaulkner opened this issue Aug 17, 2017 · 1 comment
Closed

Clarification over branches #726

kpfaulkner opened this issue Aug 17, 2017 · 1 comment
Assignees
Labels
question The issue doesn't require a change to the product in order to be resolved. Most issues start as that

Comments

@kpfaulkner
Copy link
Contributor

Hi

I see it's a while since anything was committed to the dev branch, but master has some recent changes. Have all the changes been merged into master?

Merely curious since I've started updating the https://github.com/Azure-Samples/storage-blob-go-getting-started to give blob/table/queue examples but it wasn't clear (to me) if master had all the new changes or if things were still happening in dev.

Cheers

Ken

@marstr
Copy link
Member

marstr commented Aug 23, 2017

Howdy @kpfaulkner, sorry for the delay in responding to this!

We may have developed some bad habits, but in principal your former understanding is still correct.

The idea is that we make improvements and do feature work in either a dedicated feature branch or the dev branch. While in isolated branches, we test them, break them, then eventually feel good about it and merge them into the master. We make an exception for bug fixes that we want to include as hot patches, those go directly in master.

However, as you've noticed, we've developed some bad habits and should really get back to being diligent about having PRs target dev by default.

@marstr marstr closed this as completed Aug 23, 2017
@marstr marstr added the question The issue doesn't require a change to the product in order to be resolved. Most issues start as that label Aug 23, 2017
@github-actions github-actions bot locked and limited conversation to collaborators Apr 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
question The issue doesn't require a change to the product in order to be resolved. Most issues start as that
Projects
None yet
Development

No branches or pull requests

3 participants