diff --git a/.gitignore b/.gitignore index a182852b7..0cfb188a3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ node_modules .project .settings/ npm-debug.log +.directory # vim temporary files .*.sw[op] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a6660fb3b..252caf9cc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,6 +14,7 @@ There are a few preferences regarding **code contributions**: - vis.js follows the node.js code style as described [here](http://nodeguide.com/style.html). - When implementing new features, please update the documentation accordingly. +- Make changes in the `develop` branch, not the `master` branch. - Send pull requests to the `develop` branch, not the `master` branch. - Only commit changes done in the source files under `lib`, not to the builds which are located in the folder `dist`.