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

No video

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

Рет қаралды 27,903

Күн бұрын

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.

Пікірлер: 76

@AbhishekSingh-tz4eb Ай бұрын

Bird's chirping means he prolly made the video early morning. Good work Man!

@pratikkshirsagar6481 Жыл бұрын

Best explanation on internet, very underrated video

@ConceptandCoding Жыл бұрын

Thanks

@DemystifyFrontend Жыл бұрын

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

@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 😊

@emad1166 6 ай бұрын

Just one wish, never ever stop making such great content

@Mauliksavalia 7 ай бұрын

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

@ConceptandCoding 7 ай бұрын

thanks

@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!

@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

@suryakumar7092 3 ай бұрын

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 3 ай бұрын

thanks

@emad1166 6 ай бұрын

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

@theunusual4566 Жыл бұрын

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

@ConceptandCoding Жыл бұрын

Thank you

@KunalSinghStatus Жыл бұрын

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

@ConceptandCoding Жыл бұрын

@gauravgupta5530 2 жыл бұрын

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 2 жыл бұрын

sure

@PraveenKumar-wx5yt 10 ай бұрын

Watched many but this got me. Thanks.

@pushkerpandey9312 Жыл бұрын

this is best explanation so far

@ConceptandCoding Жыл бұрын

Thank you

@neutralengineer3873 9 ай бұрын

Awesome explanation bro. Aaj samjh aaya.

@ConceptandCoding 9 ай бұрын

Thanks

@vishakhathombare6387 9 ай бұрын

Very clearly and nicely explained.. thank you so much

@ConceptandCoding 9 ай бұрын

Thanks

@ramsai6141 Жыл бұрын

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

@ConceptandCoding Жыл бұрын

thank you

@mundruramakrishna9260 2 ай бұрын

Can you make these Git videos in English, so that it will be very helpful to follow all your videos in one flow. You're doing a great job, Thank you for your efforts.

@sundergopalsingh 2 жыл бұрын

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

@ConceptandCoding 2 жыл бұрын

thanks sunder

@light-sg5sl 11 ай бұрын

Thank you sirji Very helpful

@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

@mayankukarde9288 Ай бұрын

Really great explanation... Just one doubt... If we have git pull (git fetch + git merge) then why should we use git merge ?

@tusharguptayash Жыл бұрын

Bro thumbnail is summary and it is good

@ConceptandCoding Жыл бұрын

@aj_shela 6 ай бұрын

Very good explanation👍

@ConceptandCoding 6 ай бұрын

thanks

@raipurianfooddiary4275 7 ай бұрын

Great Explanation 👍

@ConceptandCoding 7 ай бұрын

thanks

@AshishGupta-xw9yh 13 күн бұрын

great concept

@ramprasadthakur1682 2 ай бұрын

Thanks

@aakashbobade7578 Жыл бұрын

Very simple nice thanks

@ConceptandCoding Жыл бұрын

thanks

@KishanSingh-ol7pd Жыл бұрын

Keep up the good work:) more power to you

@ConceptandCoding Жыл бұрын

thank you

@unemployedcse3514 8 ай бұрын

Awesome ❤

@sadashivshinde9150 2 жыл бұрын

Thanks for the video it was helpful

@ConceptandCoding 2 жыл бұрын

welcome

@sakibmalik6956 Жыл бұрын

Thanku sir this is very helpful

@ConceptandCoding Жыл бұрын

Thank you

@sakibmalik6956 Жыл бұрын

@@ConceptandCoding welcome sir

@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 👏

@pramilasatheesh54 Жыл бұрын

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

@ConceptandCoding Жыл бұрын

Nope :)

@anonymous34565 8 ай бұрын

❤ pls also explain merge conflict and resolution

@ConceptandCoding 8 ай бұрын

Noted

@rabindraacharya5899 3 ай бұрын

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?