From 687a2cfa031d569d94173725d2405e0e8e0ddb1d Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Thu, 21 Oct 2021 08:28:31 +0200
Subject: [PATCH] Add a hint to merge requests template about rebases

---
 .gitlab/merge_request_templates/Merge request.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab/merge_request_templates/Merge request.md b/.gitlab/merge_request_templates/Merge request.md
index a30b6856a..a31d214d5 100644
--- a/.gitlab/merge_request_templates/Merge request.md	
+++ b/.gitlab/merge_request_templates/Merge request.md	
@@ -1,3 +1,6 @@
+Please avoid merging the base branch into your feature branch. We are working with rebases and those merged tend to cause trouble. 
+For further questions, join us at Matrix: https://matrix.to/#/#funkwhale-dev:matrix.org
+
 Related issue: #XXX <!-- it's okay to have no issue for small changes -->
 
 This Merge Request includes: