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

Workflow commandments #1

Open
alcarney opened this issue Mar 20, 2015 · 1 comment
Open

Workflow commandments #1

alcarney opened this issue Mar 20, 2015 · 1 comment

Comments

@alcarney
Copy link

We need a list of rules that must be followed when working on this, such as

  • Thou shalt not work on master/dev
  • Thou shalt create a new branch per feature/change
@drvinceknight
Copy link
Member

  1. There are two main branches:
    • master
    • dev
  2. No one except from @alcarney works on those branches.
  3. If you want to work on a feature, do the following:
    1. Open an issue on github
    2. Create a branch on your local copy from dev ( git checkout dev; git pull origin dev; git checkout -b dev
    3. Work on the feature on that branch.
    4. Push that feature to github (on the same branch: DO NOT PUSH TO MASTER OR DEV)
  4. Have a discussion on the issue
  5. Once things are ready they @alcarney will merge in to dev

After some time and once we know that's stable dev gets merged in to master.

If at some point we cannot stick to these rules organically we will find a way to restrict push and write access. If you're at any point confused, just ask. Things can always be reverted if they have to be.

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

No branches or pull requests

2 participants