From: David A. Velasco Date: Mon, 21 Oct 2013 09:56:16 +0000 (-0700) Subject: Merge pull request #282 from LukeOwncloud/develop X-Git-Tag: oc-android-1.5.5~160 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4d9305f35fd545e578449659b7a1dced0d5a69d7?hp=69d9ecdb6e8a2b6cc7fafa26d362fa71e203c791 Merge pull request #282 from LukeOwncloud/develop fix git update instructions --- diff --git a/SETUP.md b/SETUP.md index 5b773813..cd67a800 100644 --- a/SETUP.md +++ b/SETUP.md @@ -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: