Add some configuration hints

docs/faq.rst

 Frequently Asked Questions
 ==========================
 
+Configuration
++++++++++++++
+
 How to create automatic worflow?
 --------------------------------
 
@@ -15,6 +18,31 @@ without interaction unless some merge conflict occurs.
 3. Enable push on commit on your :ref:`project` in Weblate, this will make
    Weblate push changes to your repo whenever they are commited at Weblate.
 
+How to fix merge conflicts in translations?
+-------------------------------------------
+
+The easiest way is to solve all conflicts locally at your workstation - simply
+add Weblate as remote repository, merge it into upstream and fix conflicts.
+Once you push changes back, Weblate will be able to use merged version without
+any other special actions.
+
+.. seealso:: :ref:`git-export`
+
+.. _git-export:
+
+How to export Git repository weblate uses?
+------------------------------------------
+
+There is nothing special about the repository, it lives under
+:setting:`GIT_ROOT` directory and is named as `project/subproject/`. If you
+have SSH access to this machine, you can use the repository directly.
+
+For anonymous acces you might want to run git server and let it serve the
+repository to outside world.
+
+Troubleshooting
++++++++++++++++
+
 Requests sometimes fail with too many open files error
 ------------------------------------------------------
 
@@ -65,6 +93,9 @@ as ``TEMP`` variable:
 
 .. seealso:: :djadmin:`rebuild_index`
 
+Features
+++++++++
+
 Does Weblate support other VCS than Git?
 ----------------------------------------