Git rebase vs merge

Git rebase and merge both integrate changes from one branch into another. Where they differ is how it's done. Git rebase moves a feature branch into a master. Git merge adds a new commit, preserving the history

Git rebase vs merge

If you want to see the history completely same as it happened, you should use merge. Merge preserves history whereas rebase rewrites it.
Rebasing is better to streamline a complex history, you are able to change the commit history by interactive rebase. 
You can remove undesired commits, squash two or more commits into one or edit the commit message.
Rebase will present conflicts one commit at a time whereas merge will present them all at once.
It is better and much easier to handle the conflicts but you shouldn’t forget that
reverting a rebase is much more difficult than reverting a merge if there are many conflicts. 
You can find details of a basic rebase process from git — Basic Rebase .

Git pull vs rebase

git pull fetches the latest changes of the current branch from a remote and applies those changes to your local copy of the branch. 
Generally this is done by merging, i.e. the local changes are merged into the remote changes. So git pull is similar to git fetch & git merge.

git pull --rebase :
The local changes you made will be rebased on top of the remote changes, instead of being merged with the remote changes.

Similar codes

16 votes250 views3 answers
Flutter doctor android license error
Shell/Bash
1 vote272 views1 answer
Linux search for file everywhere
Shell/Bash
0 vote246 views1 answer
Read last line file bash
Shell/Bash
1 vote274 views1 answer
List aws configuretion
Shell/Bash
1 vote255 views1 answer
Rm all files starting with
Shell/Bash
0 vote259 views2 answers
Udpate node terminal windows
Shell/Bash
8 votes213 views3 answers
Install yarn ubuntu 20.04
Shell/Bash
0 vote283 views1 answer
What is remote repository
Shell/Bash
0 vote245 views1 answer
Recursive grep recursion depth
Shell/Bash
1 vote265 views1 answer
Copy whole directory command line
Shell/Bash