Commit 7ecdfba1 authored by Michal Čihař's avatar Michal Čihař

Document rebasing and possible issues with that

parent d974e68b
......@@ -49,7 +49,8 @@ strings in the message:
Project name
There are also additional features which you can control, like automatic
pushing of changes (see also :ref:`push-changes`), git committer name or
pushing of changes (see also :ref:`push-changes`), merge or rebase
(see :ref:`merge-rebase`), git committer name or
maintaining of Translation-Team header.
.. _subproject:
......@@ -158,6 +159,21 @@ first, otherwise push will fail.
You can also enable automatic pushing changes on commit, this can be done in
project configuration.
.. _merge-rebase:
Merge or rebase
---------------
By default Weblate merges upstream repository into it's own. This is safest way
in case you also access underlaying repository by other means. In case you don't
need this, you can enable rebasing of changes on upstream, what will produce
history with less merge commits.
.. note::
Rebasing can cause you troubles in case of complicated merges, so carefully
consider whether you want to enable them or not.
Interacting with others
-----------------------
......
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