From 9cfdeb73c6b5dee47cf8db46b4b74dc974a9936e Mon Sep 17 00:00:00 2001 From: Tomislav R Date: Wed, 4 May 2016 20:12:58 +0200 Subject: [PATCH] Updated INSTALLATION doc --- INSTALLATION.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/INSTALLATION.rst b/INSTALLATION.rst index 3ea52569..3696b446 100644 --- a/INSTALLATION.rst +++ b/INSTALLATION.rst @@ -45,15 +45,19 @@ After You have complited the task create a pull request and ask someone to revie *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``