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

20 votes163 views6 answers
Restart nginx
Shell/Bash
0 vote133 views1 answer
Check difference between two branches git
Shell/Bash
-1 vote122 views1 answer
Psneuter download
Shell/Bash
0 vote125 views1 answer
Powershell grep for string in folder
Shell/Bash
0 vote132 views1 answer
Install jake
Shell/Bash
11 votes133 views2 answers
Create and copy folder in ubuntu
Shell/Bash
0 vote155 views1 answer
How to backup db mysql from cli
Shell/Bash
4 votes148 views1 answer
Git create new default branch
Shell/Bash
9 votes160 views5 answers
Poetry install
Shell/Bash
11 votes144 views1 answer
Remember github password global config
Shell/Bash