forked from n3-charts/line-chart
-
Notifications
You must be signed in to change notification settings - Fork 0
Contribution
chaosmail edited this page Jan 3, 2016
·
2 revisions
n3-line-charts is an AngularJS directive written in Typescript on top of D3.js. We use Gulp for running the build tasks, Karma for unit testing and Protractor for integration testing. All our tests are also written in Typescript.
Fetch the repo :
$ git clone https://github.com/n3-charts/line-chart.gitInstall dev dependencies :
$ npm installInstall the type definitions :
$ tsd reinstall -sWatch :
$ gulp watchOr just build :
$ gulpRun the integration tests :
$ gulp test:e2eRun the demo (http://localhost:1234/test/e2e) :
$ gulp demoPlease make sure that your feature or fix has already been discussed in the issue section before submitting a PR, so we can make sure the PR is going to be awesome (and accepted).
During the following steps, I will assume that your GitHub user is called chaosmail. Please replace chaosmail with your GitHub user name.
- fork this repo on GitHub
git clone git@github.com:chaosmail/line-chart.gitcd line-chartgit remote add upstream git@github.com:n3-charts/line-chart.gitnpm installbower install-
git checkout -b feat/awesome-featureorgit checkout -b fix/nasty-bug - Code your feature, fix the bug, write tests
gruntgit commit -a -m "Fixed the nasty bug"git push -u origin feat/awesome-feature- Create a PR on GitHub with the feature/bug description and the text "Fixes #999" or "Reolves #999" in it - where 999 is the issue number; create a CodePen or Plunker to show the new feature
- Submit the PR for review
- Wait for our comments; if everything is fine jump to 34.
- Adjust your code so that everyone is happy
gruntgit commit -a -m "Hope everyone is happy"git push- If there are new comments and remarks go back to 15.
- If there have been no changes on the master branch in the original repo jump to 29.
git checkout mastergit fetch upstreamgit rebase upstream/mastergit checkout -b feat/awesome-featuregit rebase mastergruntgit add buildgit rebase --continue- If you made just a single commit jump to 34.
git merge-base feat/awesome-feature master-
git rebase -i ${HASH}replace ${HASH} with the merge-base hash from the previous command - pick first commit, and squash the other commits by replacing
pickwithsquash git push -f- Wait until we merge the PR into the master branch
- Relax and get a beer, you have done an awesome job