forked from AFPy/python-docs-fr
Try another procedure to merge from tx. Git is giving too much
modifications in metadata, line orders, and so on.
This commit is contained in:
parent
5cd5144126
commit
63c15e6e46
13
README.rst
13
README.rst
|
@ -326,13 +326,14 @@ from Pypi.
|
||||||
|
|
||||||
You'll need to configure ``tx`` via ``tx init`` if not already done.
|
You'll need to configure ``tx`` via ``tx init`` if not already done.
|
||||||
|
|
||||||
You should work on a separate ``transifex`` branch.
|
|
||||||
|
|
||||||
.. code-block:: bash
|
.. 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
|
poindent --modified
|
||||||
git commit -m "tx pull"
|
git commit -m "tx pull"
|
||||||
git checkout 3.6
|
tx push -t -f
|
||||||
git merge transifex -Xours
|
|
||||||
tx push -t
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user