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.

Sign up for GitHub

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

Jump to bottom

Instruction how to deal with branches #346

Merged
merged 1 commit into from
Dec 16, 2014
Merged

Instruction how to deal with branches #346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions DEVELOPMENT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Development instructions

### Branches
The project is developed in `dev` branch. New feature or fix should come with a pull request from a fork. You can make a
pull request from either your `dev` branch or from a feature branch.

### Running development server and watches

The project contains a small demo stylesheet that can be used to develop the UI.
Expand Down Expand Up @@ -35,13 +39,14 @@ To be able to check during development, please

1. Check that all the needed pull requests are merged
1. Make sure that your clone fetched all the tags which exist in the SC5 repo
1. Rebase your `master` branch against SC5
1. Create `release/x.y.z` branch with the number of upcoming version and switch to it
1. Rebase your `dev` branch against SC5
1. Create `release/x.y.z` branch from `dev` with the number of upcoming version and switch to it
1. Increment the package number in `package.json`
1. Run `gulp publish`
1. Check the `CHANGELOG.md` file. You can remove not needed items or rename them.
1. Commit changes
1. Make a pull request from your feature branch
1. Make a pull request from your feature branch into `dev`
1. Once it is merged, make a pull request from `dev` to `master`
1. Once your pull request is merged, rebase your `master` against SC5 again
1. Run `npm publish`
1. Create a versioning tag in GitHub. Insert the `CHANGELOG.md` content as a description of this versioning tag.