Upgrade transifex merge procedure using a git branch.

JulienPalard · JulienPalard · commit 45eadd745562 · 2018-03-23T15:07:57.000+01:00
diff --git a/README.rst b/README.rst
@@ -231,18 +231,18 @@ Run a test build locally
 Synchronize translation with Transifex
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You'll need the ``transifex-client``, ``pomerge``, and ``poindent``
-from Pypi, and you'll need to configure ``tx`` via ``tx init``, and then:
+You'll need the ``transifex-client`` and ``poindent``
+from Pypi.
 
-.. code-block:: bash
-
-   tx pull
-   pomerge --from .tx/*.po .tx/**/*.po --to *.po **/*.po
-   poindent --modified
+You'll need to configure ``tx`` via ``tx init`` if not already done.
 
-Now you should review and commit the pull, then push:
+You should work on a separate ``transifex`` branch.
 
 .. code-block:: bash
 
-   pomerge --from *.po **/*.po --to .tx/*.po .tx/**/*.po
+   tx pull
+   poindent --modified
+   git commit -m "tx pull"
+   git checkout 3.6
+   git merge transifex -Xours
    tx push -t
