Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
b1b2dcc8
Commit
b1b2dcc8
authored
Feb 08, 2016
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Document why merge conflicts happen
Signed-off-by:
Michal Čihař
<
michal@cihar.com
>
parent
5bc0c001
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
docs/faq.rst
docs/faq.rst
+13
-4
No files found.
docs/faq.rst
View file @
b1b2dcc8
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment