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

Added points to note while using git rebase (#25244)

Browse Source 
Git rebase is very powerful but is dangerous as well. Updated the guide to mention when to use rebase, and when not to use rebase.
This commit is contained in:
Aditya Sridhar
2019-01-16 02:12:08 +05:30
committed by Manish Giri
parent 5831dc657a
commit 4e342714db
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,14 @@ pick 5186a9f <message for this commit>
- 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.
### Points to Note
Git Rebase is a very powerful feature. That being said, it is **risky** as well if it is not used in the right way.
Git rebase alters the commit history. So use it with care. If Rebasing is done in the remote repository, then it can create a lot of issues when other developers try to pull the latest code changes from the remote repository.
As much as possible try using Git Rebase only to rebase a local git repository.
### More Information: ### More Information:
- [Git documentation: rebase](https://git-scm.com/docs/git-rebase) - [Git documentation: rebase](https://git-scm.com/docs/git-rebase)
- [Thoughbot interactive guide to git rebase](https://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history) - [Thoughbot interactive guide to git rebase](https://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history)