From ac645283bb514e9fd30d60fd719d13e4a08e0f1b Mon Sep 17 00:00:00 2001
From: Christos <kokosias.christos@gmail.com>
Date: Mon, 14 Dec 2020 13:40:00 +0000
Subject: [PATCH] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e662cf679..13f5fa404 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,6 +21,7 @@ We maintain master as the production branch and tag it with release names. If yo
 - Create a user account on Coko GitLab : http://gitlab.coko.foundation
 - Clone master with `git clone https://gitlab.coko.foundation/wax/wax-prosemirror.git`
 - Create a new branch and work off that. Please name the branch in a way that sensibly identifies the feature you are working on. You can push the branch to Coko Gitlab at anytime.
+- If the master branch has moved forward, at the time of finishing the feature, rebase your branch to master(git rebase master),resolve if any conflicts, check that everything worked as before, and then submit a MR
 
 ## Getting your contributions merged
 
-- 
GitLab