khanh.pndc/nextcloud-docs
1
0
Fork 0
mirror of https://github.com/nextcloud/documentation.git synced 2026-01-03 10:20:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix CONTRIBUTING

Browse Source
This commit is contained in:
Daniel Molkentin
2013-11-04 22:08:56 +01:00
parent 9e2d5dc691
commit 62de4134c1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CONTRIBUTING.rst
View File

@@ -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