From 22b27c59a220405e49fe32ada4dd40c8c98486a2 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 28 Aug 2018 13:04:24 +0200
Subject: [PATCH] Updated How to merge a PR (markdown)

---
 How-to-merge-a-PR.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/How-to-merge-a-PR.md b/How-to-merge-a-PR.md
index 90e1aaa..a8d239c 100644
--- a/How-to-merge-a-PR.md
+++ b/How-to-merge-a-PR.md
@@ -2,9 +2,12 @@
 2. Wait for a Maintainer review
 3. Do the requested changes
 4. Rebase with `dev` if its necessary:
-```
+```bash
 git checkout dev
 git pull
 git checkout <the_branch_im_working_in>
 git rebase dev
+## The rebase might consist of several commits so you might have to do this several times after resolving a collision:
+git rebase --continue
+### Check if everything works, and no tests fail.
 ```
\ No newline at end of file