From f536da4e013ead5a127e30547819cbd77d7c4598 Mon Sep 17 00:00:00 2001
From: Tomislav R <tmslav@gmail.com>
Date: Wed, 4 May 2016 20:11:15 +0200
Subject: [PATCH] Updated INSTALLATION doc

---
 INSTALLATION.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/INSTALLATION.rst b/INSTALLATION.rst
index 26a4ae0e..3ea52569 100644
--- a/INSTALLATION.rst
+++ b/INSTALLATION.rst
@@ -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/>`_
 
+*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``
+
+
+