Commit b1b2dcc8 authored by Michal Čihař's avatar Michal Čihař

Document why merge conflicts happen

Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent 5bc0c001
......@@ -33,10 +33,19 @@ Please see :ref:`vcs-repos` for information about setting up SSH keys.
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.
The merge conflicts happen time to time when the translation file is changed in
both Weblate and upstream repository. You can usually avoid this by merging
Weblate translations prior to doing some changes in the translation files (eg.
before executing msgmerge). Just tell Weblate to commit all pending
tranlslations (you can do it in the :guilabel:`Repository maintenance` in the
:guilabel:`Tools` menu) and merge the repository (if automatic push is not
enabled).
If you've already ran to the merge conflict, 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.
.. code-block:: sh
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment