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.

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

Tweniee/Isssue:#11361 Updated Document for PR #11509

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions docs/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -487,23 +487,41 @@ For more information, see the next section on :doc:`/manual_testing/index`.
Submitting a pull request
-------------------------

Here's a very simple scenario. Below, your remote is called ``origin``, and Learning Equality is ``le``.
Here's a very simple scenario. Below, your remote is called ``origin``, Learning Equality is ``le``, and ``release-v*`` is current release.

First, create a new local working branch:


Make sure you have local versions of the Learning Equality ``develop`` branch and the Learning Equality ``release-v*`` branch and ensure that both branches are up to date.

For this guide, we'll assume they are named ``develop`` and ``release-v*`` branches, respectively.

.. code-block:: bash

# checkout the upstream develop branch
git checkout le/develop
# make a new feature branch
git checkout -b my-awesome-changes
git checkout develop

After making changes to the code and committing them locally, push your working branch to your fork on GitHub:

.. code-block:: bash

git push origin my-awesome-changes
git push origin develop


Run Rebase Command

.. code-block:: bash

git rebase --onto release-v* develop

This command will rebase your current branch ``(develop)`` onto ``release-v*``, removing any commits that are already present in ``develop``.

After completing the rebase, you will need to force push to update your remote branch. Use the following command:

.. code-block:: bash

git push --force


Go to Kolibri's `GitHub page <https://github.com/learningequality/kolibri>`__, and create a the new pull request.

.. note::
Expand Down