Code-Approval-Procedure.md

@@ -98,7 +98,9 @@ The code approval procedure is described in the wiki: [Code approval procedure w
   - [ ] There are no debug statements left, not even commented out
   - [ ] Check all changes for coding rules and guidelines
 - When all above is done: 
-  - [ ] Rebase, if needed. 
   - **Add MR label "Code Review Finished"**
   - **Approve** (click button)
+  - Rebase, if needed. If unclear: discuss! 
+    - [ ] git rebase master (rebase on top of master)
+    - [ ] git merge master (merge back changes from master)
 ```