Git Merge VS Rebase In REAL TIME | DevOps Shack

[@manojkumar-le2ec]

All cleared thanks brother 😊

[@johnrafaellim3200]

Straight to the point explanation! Thank you!

[@TikTokTrendsCompilation]

When should i use one over the other?

[@gurdipedosanjh7887]

Brilliant video, what are the ways/best practices to prevent file conflicts when merging or rebasing and keeping your features branch up to date with the main branch

[@matk2283]

nice tutorial on rebase. Thank you!!

[@smitshah1110]

when I merge the dev branch into the main branch, there is no extra commit added. Please give me reply here

[@Sashidhar_Reddy]

When i tried merge it happen fast forward merge so extra commit is not added.Why it gappened any thing wrong i did

[@noyonnabi6448]

Thank you brother.

[@ajinkya.shinagare]

Very good explanation! But I have one doubt, After performing a rebase command on main I don't see an additional commit which was added at the time of merge like 'merge branch dev' As you mentioned in the merge command we should see an additional commit. Added 3.txt Merge branch dev// Is it skipped in log? Aditya added new files added new file Can you please provide details?

[@gaurav_das]

I think he messed up while explaining..git merge command provides extra commit where as git rebase don't..skip the diagram and focus on the practical demo part

[@sheelamlaxmareddy1637]

Thanks for useful video

[@RameshDharecha91]

Good explanation

[@durairajgopal3277]

Nice bro❤

[@kartikphirke8599]

nicely explained.

[@SachinSingh-dz9hh]

Hi Aditya... Are there any other differences also apart from the extra commit???

[@devopsshack]

History in git is preserved in git merge and not in git rebase Mentioned in video as well

[@SachinSingh-dz9hh]

​@@devopsshackThanks....

[@arikicherlanagapurushotham7778]

clear explanation but music is irritating

[@user-he7lg4bi8p]

bro why did you removed python playlist

[@devopsshack]

Not removed buddy It will be public tomorrow I m reediting some parts