Switch to master + features branches about psdeploy HOT 6 CLOSED

I ran into the exact same thing. People issued pull requests on dev when they should have been using master. Feature branches merging into a master branch is just simpler.

from psdeploy.

But you should be pulling to the dev branch, right? That's the whole point of a dev branch (which is just a generic feature branch). When you have enough pulls on dev that you want to go live the owner does a pull from the dev branch to the master?

That's my understanding.

from psdeploy.

Yep! The problem is that we can't control what branch folks work from, or submit a pull request against - it can be dissuading to them to turn around and say redo this against dev. Particularly if they're new to git or GitHub.

With just prod, there can be no mistakes, and we can accept PRs on demand, no need to accept+merge-to-master-at-some-point.

Cheers!

from psdeploy.

True, but somehow just doesn't feel right. I have an open PR to dev, want me to refork off master and resubmit?

from psdeploy.

Nope! I'l go ahead and merge that, merge dev into master, update contributing references to dev branch, and kill dev branch.

Timing wise, might be next week; a bit busy wrapping up before holiday break during work, and last minute shopping and prep after work.

Cheers!

from psdeploy.

Deleted and updated docs, we'll work off master now.

I'll try to keep my own commits, barring minor changes (I know...) to branches to avoid any issues - everyone else can treat the fork as a branch, and submit the PR to master.

Cheers!

from psdeploy.