ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Updated INSTALLATION doc

Browse source
This commit is contained in:
Tomislav R 2016-05-04 20:12:58 +02:00
parent d7b31c443a
commit 7faf08bfde
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
INSTALLATION.rst
View file

@ -45,15 +45,19 @@ After You have complited the task create a pull request and ask someone to revie
*merging your branch* *merging your branch*
**IMPORTANT** **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. 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 Also You can run
``./manage test`` ``./manage test``
To merge upstream branch run this git commands. To merge upstream branch run this git commands.
``git fetch upstream`` ``git fetch upstream``
``git checkout your_feature_branch`` ``git checkout your_feature_branch``
``git merge remotes/upstream/develop`` ``git merge remotes/upstream/develop``