Git Merge Vs Rebase with Example | Differences Between Git Merge and Rebase and which one to choose?

Hi,
Today i have explained the 2 main commands of Git.
1. Git Merge
2. Git Rebase
Both are used to integrated the changes of one branch in another. But the way they work is different.
- Git Merge, preserve the commit history, while Git Rebase re-writes the commit history.
- Git Merge add new commit but Git rebase do not add any new commit.
Whenever we work in Public branch, try to avoid Git Rebase.

[@amofficialtv4642]

I have seen many youtube video. But i can't understand what does rebase doing. Finally your video clear me. Very helpful video.Thank you❤️

[@ConceptandCoding]

Thank you 😊

[@suryakumar7092]

Not knowing this concept, I was once rebasing my feature_branch with master locally. Got few merge_conflicts, resolved it, and rebased again, again got same conflicts, again resolved them and rebased again....this cycle continued till my senior observed it and suggested me go and watch why I shouldn't do rabase but merge.
Now its clear (Thanks to ur video), rebasing was removing my merge_resolved commit and re-applying those onto master, which means nothing to master and hence the iterative merge_conflicts.

[@ConceptandCoding]

thanks

[@pratikkshirsagar6481]

Best explanation on internet, very underrated video

[@ConceptandCoding]

Thanks

[@DemystifyFrontend]

Bhai good content on TH-cam is always underrated. Its rated when good seekers like us😂 meet awesome content like this

[@Mauliksavalia]

You have explained in very well manner. This is very informative video. I just get this concept in a single time.

[@ConceptandCoding]

thanks

[@emad1166]

Simple explanation, very well explained. Sometimes simplicity is what needed for complex things

[@farhaankazi7134]

video is very good. it cleared my things along with merge and rebase. For example If I am not wrong then rebase does not create new commit just write last commit of the one branch to other branch. First rebase takes the last commit of first branch and then write all changes to second last commit of another branch. Such action obliterate the history or tracking of commits as well as forking of branches (linking of branches done by merging). Although, rebase makes it simple linear but it rewrite new history. This can also be dangerous if many developers are working together and committing lot of changes and creating many forks. Rebase will erase the forks and links and we can not trace back in time properly to undo new changes

[@mohitsinha7236]

This video is very helpful. I read many documentation and watched many videos on this topic. None helped me like this video. Great work!

[@emad1166]

Just one wish, never ever stop making such great content

[@PraveenKumar-wx5yt]

Watched many but this got me. Thanks.

[@gauravgupta5530]

I want to say that, I have bookmarked this video in my GitHub learnings. Thanks for such a wonderful explanation and with a short description of notes too. Keep up the good work 🙂.
Also want to learn from you the distinction between rollback with rebase and hard reset.

[@ConceptandCoding]

sure

[@theunusual4566]

Ek number Bhiya, Got it in one go. Thanks for the video.

[@ConceptandCoding]

Thank you

[@ramsai6141]

Crystal clear explaination brother.
Keep doing such an informative useful videos.

[@ConceptandCoding]

thank you

[@DharmeshTechZone]

Nice video very easy and clean understanding for closest different between them, thank you so much

[@ConceptandCoding]

Thank you. And glad you liked the video

[@KunalSinghStatus]

mind blowing sir, I tried by myself for the testing ... Understood 🙏🏻🙏🏻

[@ConceptandCoding]

:)

[@sundergopalsingh]

Very informative content about the basics of git and rebase , merge usage

[@ConceptandCoding]

thanks sunder

[@vishakhathombare6387]

Very clearly and nicely explained.. thank you so much

[@ConceptandCoding]

Thanks

[@light-sg5sl]

Thank you sirji
Very helpful

[@aj_shela]

Very good explanation👍

[@ConceptandCoding]

thanks

[@neutralengineer3873]

Awesome explanation bro. Aaj samjh aaya.

[@ConceptandCoding]

Thanks

[@sadashivshinde9150]

Thanks for the video it was helpful

[@ConceptandCoding]

welcome

[@KishanSingh-ol7pd]

Keep up the good work:) more power to you

[@ConceptandCoding]

thank you

[@pushkerpandey9312]

this is best explanation so far

[@ConceptandCoding]

Thank you

[@raipurianfooddiary4275]

Great Explanation 👍

[@ConceptandCoding]

thanks

[@unemployedcse3514]

Awesome ❤

[@aakashbobade7578]

Very simple nice thanks

[@ConceptandCoding]

thanks

[@rexitspersonal8353]

while doing (git merge master) f1 -> m1 -> m2 -> f2 -> f3 this is the sequence right, now if m1 and m2 are alredy merged then what is in f3 commit

[@ramprasadthakur1682]

Thanks

[@ch.pruthvi9632]

Hey Brother it's a great video! Can u also make a video on merge conflicts cases and handling in both merge and rebase cases

[@ConceptandCoding]

Noted

[@sakibmalik6956]

Thanku sir this is very helpful

[@ConceptandCoding]

Thank you

[@sakibmalik6956]

@@ConceptandCoding welcome sir

[@pramilasatheesh54]

Wonderful explanation... Do u have other videos for git.. Grt

[@ConceptandCoding]

Nope :)

[@rabindraacharya5899]

Hello,
Encountered an issue when pulling code from the origin repository:
fatal: Not possible to fast-forward, aborting.
I resolved it by rebasing, but this problem recurs whenever someone pushes code. Oddly, it only occurs on my system. Any suggestions for a permanent fix? Currently, I resort to rebasing every time to address it. Is there a more lasting solution available?

[@tusharguptayash]

Bro thumbnail is summary and it is good

[@ConceptandCoding]

:)

[@Artofcoding786]

Awesome

[@ConceptandCoding]

Thanks

[@Artofcoding786]

@@ConceptandCoding Can we have a call? Need some guidance
Thanks

[@DevanshiGupta-nn3zh]

Good explanation ....when will you launch your Spring Boot series...eagerly waiting !!

[@ConceptandCoding]

Soon, only few Java topics left after that I will start springboot

[@DevanshiGupta-nn3zh]

Great 👏

[@farhaankazi7134]

Hi Can you provide link to download the list of commands you shown in vlog with explanation

[@ConceptandCoding]

I will create and share buddy

[@anonymous34565]

❤ pls also explain merge conflict and resolution

[@ConceptandCoding]

Noted

[@kuchalaggyan2502]

Git ka sara command kha per hai

[@vishalsaxena5081]

u should use practical also

[@ConceptandCoding]

Noted

[@vivekkumarshaw6495]

Sir can u please share ur telegram grp link

[@ConceptandCoding]

t.me/+e3MpFJyqdMtkMGU1