From 9618006d959c573d0c3f3e8c087ac8273ff0f8e4 Mon Sep 17 00:00:00 2001
From: Benjamin Dubois <dubois.benjamin@gmail.com>
Date: Wed, 5 Dec 2018 05:42:14 +0100
Subject: [PATCH] Detail on stop/resume during interactive rebase (#24035)

* Detail on stop/resume during interactive rebase

Specified when interactive rebase will stop and how to continue the process

* Update index.md
---
 guide/english/git/git-rebase/index.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/guide/english/git/git-rebase/index.md b/guide/english/git/git-rebase/index.md
index 52f71d3cc2..e6c688cfb0 100644
--- a/guide/english/git/git-rebase/index.md
+++ b/guide/english/git/git-rebase/index.md
@@ -47,14 +47,14 @@ pick 5186a9f <message for this commit>
 #
 # Commands:
 # p, pick = use commit
-# r, reword = use commit, but edit the commit message
-# e, edit = use commit, but stop for amending
-# s, squash = use commit, but meld into previous commit
-# f, fixup = like "squash", but discard this commit's log message
+# r, reword = use commit, but stop to edit the commit message.
+# e, edit = use commit, but stop to amend or add commit.
+# s, squash = use commit, meld into previous commit and stop to edit the commit message.
+# f, fixup = like "squash", but discard this commit's log message thus doesn't stop.
 # x, exec = run command (the rest of the line) using shell
 # d, drop = remove commit
 #
-# These lines can be re-ordered; they are executed from top to bottom.
+# These lines can be re-ordered; they are executed from top to bottom. 
 #
 # If you remove a line here THAT COMMIT WILL BE LOST.
 #
@@ -64,6 +64,7 @@ pick 5186a9f <message for this commit>
 ```
 
 - Enter `esc` followed by `:wq` to save and quit.
+- When rebase is stopped, make the necessary adjustments, then use `git rebase --continue` until rebase is successful
 - If it rebases successfully then you need to force push your changes with `git push -f` to add the rebased version to your github repo.
 - If there is a merge conflict, there are a number of ways to fix this, including following the suggestions in [this guide](https://help.github.com/enterprise/2.11/user/articles/resolving-a-merge-conflict-using-the-command-line/). One way is to open the files in a text editor and delete the parts of the code you do not want. Then use `git add <file name>` followed by `git rebase --continue`. You can skip over the conflicted commit by entering `git rebase --skip`, exit the git rebase by entering `git rebase --abort` in your console.