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 vote180 views1 answer
Centos selinux set permissive
Shell/Bash
5 votes228 views1 answer
Command to get number of commits
Shell/Bash
0 vote182 views1 answer
Cv2 has no attribute videocapture
Shell/Bash
0 vote173 views1 answer
Cut command in unix set diameter
Shell/Bash
0 vote228 views1 answer
Delete directories starting with a certain string
Shell/Bash
-2 votes177 views1 answer
Stop systemd from suspending on inactivity
Shell/Bash
0 vote195 views1 answer
Pipgui install
Shell/Bash
35 votes186 views1 answer
How to isntall yarn
Shell/Bash
1 vote171 views1 answer
Ubuntu remove all unnecessary packages
Shell/Bash
0 vote301 views1 answer
Set wp-config.php using wp-cli
Shell/Bash