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
7ecdfba1
Commit
7ecdfba1
authored
Sep 11, 2012
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Document rebasing and possible issues with that
parent
d974e68b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
1 deletion
+17
-1
docs/admin.rst
docs/admin.rst
+17
-1
No files found.
docs/admin.rst
View file @
7ecdfba1
...
...
@@ -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
-----------------------
...
...
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