From: David A. Velasco Date: Thu, 6 Aug 2015 11:00:45 +0000 (+0200) Subject: Updated documents and .gitmodules with new policy: PRs should go to master, no more... X-Git-Tag: oc-android-1.8~27^2~7^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/31416593062eedc853969e1ad10d216be4914931 Updated documents and .gitmodules with new policy: PRs should go to master, no more to develop --- diff --git a/.gitmodules b/.gitmodules index 38f0f582..7ccbef03 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,7 @@ [submodule "owncloud-android-library"] path = owncloud-android-library url = git://github.com/owncloud/android-library.git - branch = develop + branch = master [submodule "ocdoc"] path = user_manual/ocdoc url = https://github.com/owncloud/documentation diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 63bfd7ff..1dc53b42 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,23 +27,23 @@ Thanks for wanting to contribute source code to ownCloud. That's great! Before we're able to merge your code into the ownCloud app for Android, you need to sign our [Contributor Agreement][agreement]. ### Guidelines -* Contribute your code in the branch 'develop'. It will give us a better chance to test your code before merging it with stable code. -* For your first contribution, start a pull request on develop and send us the signed [Contributor Agreement][agreement]. +* Contribute your code in the branch 'master'. It will give us a better chance to test your code before merging it with stable code. +* For your first contribution, start a pull request on master and send us the signed [Contributor Agreement][agreement]. * Keep on using pull requests for your next contributions although you own write permissions. [agreement]: http://owncloud.org/about/contributor-agreement/ -### 1. Fork and download android/develop repository: +### 1. Fork and download android/master repository: NOTE: You must have the git installation folder in your environment variable PATH to perform the next operations. * In a web browser, go to https://github.com/owncloud/android, and click the 'Fork' button near the top right corner. * In a command line prompt, clone your new repo: ```git clone git@github.com:YOURGITHUBNAME/android.git```. * Move to the project folder with ```cd android```. -* Checkout the remote branch 'develop' in your own local branch: ```git checkout -b develop remotes/origin/develop```. -* Pull any changes from your remote branch 'develop': ```git pull origin develop``` +* Checkout the remote branch 'master' in your own local branch: ```git checkout -b 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/develop branch: ```git pull upstream develop``` +* Make sure to get the latest changes from official android/master branch: ```git pull upstream master``` ### 7. Create pull request: @@ -53,18 +53,16 @@ NOTE: You must sign the [Contributor Agreement][1] before your changes can be ac * 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 -* Click "Edit" and set "base:develop" -* Again, click "Edit" and set "compare:develop" * Enter description and send pull request. ### 8. Create another pull request: -To make sure your new pull request does not contain commits which are already contained in previous PRs, create a new branch which is a clone of upstream/develop. +To make sure your new pull request does not contain commits which are already contained in previous PRs, create a new branch which is a clone of upstream/master. * git fetch upstream -* git checkout -b my_new_develop_branch upstream/develop -* If you want to rename that branch later: "git checkout -b my_new_develop_branch_with_new_name" -* Push branch to server: "git push -u origin name_of_local_develop_branch" +* git checkout -b my_new_master_branch upstream/master +* If you want to rename that branch later: "git checkout -b my_new_master_branch_with_new_name" +* Push branch to server: "git push -u origin name_of_local_master_branch" * Use GitHub to issue PR diff --git a/README.md b/README.md index c8bd71c3..e3ff5353 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ The app performs file synchronization with an ownCloud server. Other ownCloud features may be added in the future, but they are not a priority right now. ## Build Status on -Git master: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=master) +Git master: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=master) -Git develop: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=develop) +Git stable: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=stable) ## Development @@ -17,4 +17,4 @@ Make sure you read [SETUP.md][1] when you start working on this project. ### Contributing Please see [Contribution Guidelines](https://owncloud.org/contribute/). Fork this repository and contribute back using -[pull requests](https://github.com/owncloud/android/pulls). All pull requests should be based on, and targeted to, the ['develop'](https://github.com/owncloud/android/tree/develop) branch. +[pull requests](https://github.com/owncloud/android/pulls). All pull requests should be based on, and targeted to, the ['master'](https://github.com/owncloud/android/tree/master) branch. diff --git a/SETUP.md b/SETUP.md index e1148167..4f9cef9d 100644 --- a/SETUP.md +++ b/SETUP.md @@ -36,10 +36,10 @@ 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 'develop' in your own local branch 'develop': ```git checkout -b develop remotes/origin/develop```. -* Pull any changes from your remote branch 'develop': ```git pull origin develop``` +* Checkout the remote branch 'master' in your own local branch 'master': ```git checkout -b 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/develop branch: ```git pull upstream develop``` +* Make sure to get the latest changes from official android/master branch: ```git pull upstream master``` At this point you can continue using different tools to build the project. Section 2, 3, 4, 5 and 6 describe the existing alternatives. diff --git a/owncloud-android-library b/owncloud-android-library index 02c24c8a..e71ba7fa 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit 02c24c8a3bd87382590ece0e0744ad430718b51a +Subproject commit e71ba7faee2b24b285a05fae6a596cf8d5e76b33