gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Detail on stop/resume during interactive rebase (#24035)

Browse Source 
* Detail on stop/resume during interactive rebase

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

* Update index.md
This commit is contained in:
Benjamin Dubois
2018-12-05 05:42:14 +01:00
committed by Manish Giri
parent 17e712324a
commit 9618006d95
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
guide/english/git/git-rebase/index.md
View File

@ -47,10 +47,10 @@ pick 5186a9f <message for this commit>
# #
# Commands: # Commands:
# p, pick = use commit # p, pick = use commit
# r, reword = use commit, but edit the commit message # r, reword = use commit, but stop to edit the commit message.
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop to amend or add commit.
# s, squash = use commit, but meld into previous 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 # 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 # x, exec = run command (the rest of the line) using shell
# d, drop = remove commit # d, drop = remove commit
# #
@ -64,6 +64,7 @@ pick 5186a9f <message for this commit>
``` ```
- Enter `esc` followed by `:wq` to save and quit. - 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 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. - 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.