diff --git a/README.md b/README.md index c41fd5bf..607626fe 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,13 @@ Is expected together with Node.js 1.0 ## Developing -Before starting development, please do +### First tiny steps + +1. Register & login within [GitHub](https://github.com/Nodeclipse) +2. Add stars to the projects, that you like +3. Fork to your account, play with code + +### Before starting development, please do 1. Carefully read materials 2. Install and give thorough try @@ -151,7 +157,7 @@ In Eclipse for Java or RCP developers 1. Copy to clipboard git repository URL: https://github.com/Nodeclipse/nodeclipse-1.git 2. File -> Import.. -> Git / Project from git -#### Other way +##### Other way, not recommended way 1. git clone https://github.com/Nodeclipse/nodeclipse-1.git 2. [Download Eclipse](http://www.eclipse.org/downloads/) @@ -168,6 +174,29 @@ In Eclipse for Java or RCP developers 2. Import CodeStyle_codetemplates.xml; instructions are inside the xml file. This will add @author in new files automatically. Use Ctrl+Alt+J to quickly insert in existing files. +### Update forked project + +If you forked into your account, after a while it is possible that code at original repository was updated. + +With git command line you need to open project base folder, then + +

+git remote add upstream https://github.com/Nodeclipse/project-you-forked.git  
+git fetch upstream  
+git merge upstream/master   
+git push origin master  
+
+ +With EGit you should do the same steps but within GUI. + +### Send Pull Request steps + +1. Push to your remote origin (your account) +2. Open GitHub page for your fork +3. Press Pull Request +4. Review Commits on Commits tab +5. Write description, press Send pull request + ### Testing Developers may try latest unreleased version at update URL: diff --git a/org.nodeclipse.ui/plugin.xml b/org.nodeclipse.ui/plugin.xml index 76f64bad..09acb644 100644 --- a/org.nodeclipse.ui/plugin.xml +++ b/org.nodeclipse.ui/plugin.xml @@ -16,7 +16,7 @@ name="Node Project" project="true"> - Create a new Node.js project + Create a new Node.js project (or add .project file to existing project) - Create a new Node.js project with Express.js framework + Create a new Node.js project with Express.js framework (Express should be installed before with npm install -g express) - + - + + +