[contributor] Fix rebase procedure

Running `git commit` before `git rebase --continue` is unnecessary
when rebasing.

Change-Id: I903ecfac7c7cc75d5a43fa665866589ae7373428
This commit is contained in:
Petr Kovar 2016-08-25 16:40:23 +02:00
parent bbc590888d
commit 0229b5d518

@ -58,14 +58,13 @@ resolve conflicts when multiple commits happen on the same file.
You need to resolve a conflict by manually editing the file.
You also need to delete the '<<<<<<<', '=======', and'>>>>>>>'
in the file. Add the files to the stage by
running :command:`git add <filename>`.
in the file.
#. Commit the changes:
#. Add the files to the stage:
.. code-block:: console
$ git commit
$ git add $FILENAME
#. Complete the rebase process: