Link to FAQ in merge failure mails

docs/faq.rst

@@ -21,6 +21,8 @@ without interaction unless some merge conflict occurs.
    Weblate push changes to your repository whenever they are committed at Weblate.
 4. Optionally setup cron job for :djadmin:`commit_pending`.
 
+.. _merge:
+
 How to fix merge conflicts in translations?
 -------------------------------------------
 

weblate/html/mail/merge_failure.html

@@ -24,4 +24,8 @@
 <pre>
 {{ status }}
 </pre>
+
+<p><a href="{% documentation "faq" "merge" %}">{% trans "Check our FAQ for information how to resolve this." %}</a></p>
+
+
 {% endblock %}

weblate/html/mail/merge_failure.txt

@@ -10,4 +10,8 @@
 
 {{ status }}
 
+{% trans "Check our FAQ for information how to resolve this." %}
+
+{% documentation "faq" "merge" %}
+
 {% endfilter%}{% endautoescape %}{% include "mail/signature.txt" %}