Adjust merge request template, recommend to merge fixes directly to stable

This commit is contained in:
Georg Krause 2021-11-10 11:55:54 +01:00
parent a0560f020f
commit f392451ede
No known key found for this signature in database
GPG Key ID: FD479B9A4D48E632
1 changed files with 2 additions and 0 deletions

View File

@ -1,6 +1,8 @@
Please avoid merging the base branch into your feature branch. We are working with rebases and those merged tend to cause trouble. 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 For further questions, join us at Matrix: https://matrix.to/#/#funkwhale-dev:matrix.org
If your contribution is fixing an issue by a small change, please consider a merge into `stable` by using it as target branch.
Related issue: #XXX <!-- it's okay to have no issue for small changes --> Related issue: #XXX <!-- it's okay to have no issue for small changes -->
This Merge Request includes: This Merge Request includes: