search

PoshCode / PSGit

A PowerShell implementation of Git, mapping git commands to Verb-Noun and objects.
105 stars 15 forks source link

Update PSGit.psd1 #25

Closed eedrah closed 9 years ago

eedrah commented 9 years ago

Hi Joel,

How would you like me to interact with this project? Pull requests are great, but this one, for example, is one character in a description. I'll still create a pull request rather than committing directly to master?

Cheers, Jesse

Jaykul commented 9 years ago

Frustratingly, it's hard to like .. tell a team WHY I assigned them to a project on GitHub ;-)

This project is an experiment. We're trying to figure out the best way of communicating about projects and working together on them -- while we do something useful.

I added a few guys from the PSStyleGuide to a team PoshCode\Best Practices with the idea that perhaps we could work on the style guide here, but also, perhaps, I could entice some of you into helping with the other projects where we're trying to help people fall into the pit of success...

Jaykul commented 9 years ago

So we are currently experimenting with using git flow -- the question being whether it's too much for non-developers to figure out, or whether we can script the pain away. Actually, I need to update CONTRIBUTING.md to state that.

So in general:

  1. Branch off dev to create feature branches and merge them back to dev.
  2. Branch off dev when we have enough to release to create a release branch (do any testing/fixing/hardening), and then merge back to dev and also to master.
  3. Branch off master only for bug point-release fixes, which must also be merged to dev...

If I could get github to actually show me the diff (stupid utf-16 file), I would accept this, and also merge pull your branch to dev...

Jaykul commented 9 years ago

By the way, we're in #PoshCode on http://PowerShell.slack.com discussing this right now (if you're not joined up, you can use http://slack.poshcode.org)