Git Merge VS Rebase In REAL TIME | DevOps Shack

Git Merge VS Rebase In REAL TIME | DevOps Shack
Telegram:
t.me/+9roGPjX1YI42Yzdl
Instagram: / devopsshack
LinkedIn: / devops-shack
My DevSecOps & Cloud DevOps Course: www.devopsshack.com/courses/Z...
Paid Course Syllabus: drive.google.com/drive/folder...

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

[@noyonnabi6448]

Thank you brother.

[@matk2283]

nice tutorial on rebase. Thank you!!

[@arikicherlanagapurushotham7778]

clear explanation but music is irritating

[@sheelamlaxmareddy1637]

Thanks for useful video

[@kartikphirke8599]

nicely explained.

[@durairajgopal3277]

Nice bro❤

[@RameshDharecha91]

Good explanation

[@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....

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

[@user-he7lg4bi8p]

bro why did you removed python playlist

[@devopsshack]

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