Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operat...

[pub/Android/ownCloud.git] / SETUP.md

diff --git a/SETUP.md b/SETUP.md
index 5b77381..6e7b7f6 100644 (file)
--- a/SETUP.md
+++ b/SETUP.md
@@ -1,5 +1,5 @@
   
-  If you want to start development of ownCloud first download required files, then compile using console or Eclipse, finally create pull request:
+  If you want to start help developing ownCloud please follow the [contribution guidlines][0] and observe these instructions:
   
   1. Fork and download android/develop repository:
 
@@ -8,7 +8,10 @@
   -  Clone your new repo: "git clone git@github.com:YOURGITHUBNAME/android.git"
   -  "cd android"
   -  Checkout remote develop branch: "git checkout -b develop remotes/origin/develop"
-  -  Make sure to get the latest changes of android/develop branch: "git pull origin develop"
+  -  Pull changes from your develop branch: "git pull origin develop"
+  -  Make sure to get the latest changes from official android/develop branch:
+  -  Make official owncloud repo known as upstream: "git remote add upstream git@github.com:owncloud/android.git"
+  -  Pull latest changes from upstream: "git pull upstream develop"
 
   2. Building with console/maven:
 
@@ -39,6 +42,7 @@
 
   4. Create pull request:
   
+  -  NOTE: You must sign the [Contributor Agreement][1] before your changes can be accepted!
   -  Commit your changes locally: "git commit -a"
   -  Push your changes to your Github repo: "git push"
   -  Browse to https://github.com/YOURGITHUBNAME/android/pulls and issue pull request
@@ -47,5 +51,6 @@
   -  Enter description and send pull request.
 
 
-
+[0]: https://github.com/owncloud/android/blob/master/CONTRIBUTING.md
+[1]: http://owncloud.org/about/contributor-agreement/