ramibelgacem/python-docs-fr
1
0
Fork 0
forked from AFPy/python-docs-fr
Code Pull Requests Activity

Try another procedure to merge from tx. Git is giving too much

Browse Source 
modifications in metadata, line orders, and so on.
This commit is contained in:
Julien Palard 2018-08-13 10:48:38 +02:00
parent 5cd5144126
commit 63c15e6e46
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.rst
View File

@ -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