Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix error in push duty README #241

Merged
merged 1 commit into from Oct 5, 2016
Merged

Fix error in push duty README #241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions docs/server/push-duty.rst
View file
Open in desktop
Expand Up @@ -64,15 +64,16 @@ tagging::
.. note:: ``mozilla/addons-server-security`` ``master`` branch should never be
pushed to directly without pushing to ``mozilla/addons-server`` ``master``
first - the two should always stay in sync.

This means the merge or edit buttons in github web UI must never be used in
that repository.

.. note:: Here we are using "upstream" and "security" remotes, which point out
to ``mozilla/addons-server`` and ``mozilla/addons-server``, respectively. If
your configuration is different you can substitute "upstream" and "security"
for whatever you call the ``mozilla/addons-server`` and
``mozilla/addons-server-security`` repositories remotes.
.. note:: Here we are using ``upstream`` and ``security`` remotes, which point
to ``mozilla/addons-server`` and ``mozilla/addons-server-security``,
respectively. If your configuration is different you can substitute
``upstream`` and ``security`` for whatever you call the
``mozilla/addons-server`` and ``mozilla/addons-server-security``
repositories' remotes.


Tag the repos
Expand Down