From 63c15e6e46d752794735405b6375ddd754edcd9a Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Mon, 13 Aug 2018 10:48:38 +0200
Subject: [PATCH] Try another procedure to merge from tx. Git is giving too
 much modifications in metadata, line orders, and so on.

---
 README.rst | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index 29358e63..3904cc0d 100644
--- a/README.rst
+++ b/README.rst
@@ -326,13 +326,14 @@ from Pypi.
 
 You'll need to configure ``tx`` via ``tx init`` if not already done.
 
-You should work on a separate ``transifex`` branch.
-
 .. code-block:: bash
 
-   tx pull
+   pomerge --from-files **/*.po
+   tx pull -f
+   pomerge --to-files **/*.po
+   pomerge --from-files **/*.po
+   git checkout -- .
+   pomerge --to-files **/*.po
    poindent --modified
    git commit -m "tx pull"
-   git checkout 3.6
-   git merge transifex -Xours
-   tx push -t
+   tx push -t -f