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

0 vote324 views1 answer
Linux convert pdf trennen
Shell/Bash
1 vote336 views1 answer
Docker interact with running container
Shell/Bash
0 vote348 views1 answer
Debian install dig
Shell/Bash
3 votes358 views1 answer
How to prevent conda activated everytime terminal open linux
Shell/Bash
0 vote333 views1 answer
Echo or cat into multiple files
Shell/Bash
45 votes339 views6 answers
Refusing to merge unrelated histories
Shell/Bash
172 votes399 views6 answers
Nodemon installation
Shell/Bash
0 vote357 views1 answer
How to find files and copy them in terminal
Shell/Bash
0 vote347 views1 answer
Uninstall sharepoint online management shell version
Shell/Bash
35 votes351 views6 answers
Markdown image
Shell/Bash