[Pkg-owncloud-commits] [owncloud-doc] 01/05: fix CONTRIBUTING

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg_clean
in repository owncloud-doc.

commit 62de4134c1bcce49368bea186322128f680377ce
Author: Daniel Molkentin <daniel at molkentin.de>
Date:   Mon Nov 4 22:08:56 2013 +0100

    fix CONTRIBUTING
---
 CONTRIBUTING.rst |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 88b61f1..2dc83f5 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -36,11 +36,11 @@ locally, follow these steps:
 5. Commit your work, if you have write access to ownCloud, or create a pull
    request otherwise.
 6. If you have committed the work yourself, please merge the result
-   into the master branch::
+   into the latest branch (in this example: stable6)::
 
     git fetch origin
-    git checkout master
-    git merge origin/stable45 master
+    git checkout stable6 
+    git merge origin/stable5 master
     <resolve possible conflicts>
     git add <resolved conflict files>
     git commit

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git