Merge pull request #1155 from owncloud/update_setup_guide

Update setup, changes from the issue #1154
This commit is contained in:
David A. Velasco 2015-09-15 13:55:57 +02:00
commit 803f672663
2 changed files with 1 additions and 1 deletions

View file

@ -36,7 +36,7 @@ Next steps will assume you have a Github account and that you will get the code
* Open a terminal and go on with the next steps in it.
* Clone your forked repository: ```git clone git@github.com:YOURGITHUBNAME/android.git```.
* Move to the project folder with ```cd android```.
* Checkout the remote branch 'master' in your own local branch 'master': ```git checkout -b master remotes/origin/master```.
* Checkout the remote branch 'master' in your own local branch 'master': ```git checkout master remotes/origin/master```.
* Pull any changes from your remote branch 'master': ```git pull origin master```
* Make official ownCloud repo known as upstream: ```git remote add upstream git@github.com:owncloud/android.git```
* Make sure to get the latest changes from official android/master branch: ```git pull upstream master```

Binary file not shown.