amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated INSTALLATION doc

Browse source
This commit is contained in:
Tomislav R 2016-05-04 20:11:15 +02:00
parent f1716410e6
commit f536da4e01
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
INSTALLATION.rst
View file

@ -43,6 +43,21 @@ After You have complited the task create a pull request and ask someone to revie
`read more about getting code from upstream here <https://help.github.com/articles/syncing-a-fork/>`_ `read more about getting code from upstream here <https://help.github.com/articles/syncing-a-fork/>`_
*merging your branch*
**IMPORTANT**
Before You make a pull request from Your forked branch to the ungleich make sure You did merge and resolve any conflicts You may find and that the application is running bug free.
Also You can run
``./manage test``
To merge upstream branch run this git commands.
``git fetch upstream``
``git checkout your_feature_branch``
``git merge remotes/upstream/develop``