Git REBASE Explained: Unveiling Rebase's Hidden Hazard

Рет қаралды 7,276

Күн бұрын

The better way to learn Git: learngit.io/
----
In this git rebase tutorial we'll learn how to use rebase to streamline your version control workflow. Start by understanding the fundamentals of git rebase: when and why you should use it. We'll then cover best practices for using git rebase in collaborative situations with other developers, and review common rebase pitfalls to avoid. We'll also explore some pro git rebase workflow tips to help you master the most common rebase use-cases.
----
CHAPTERS
0:00 Intro & setup
0:44 Rebase re-anchor
1:07 Git rebase deconstructed
1:40 Rebase pitfalls
1:55 Git rebase workflow tip
2:45 Branch merging options
MY TECH
www.themoderncoder.com/wfh-ny...
MUSIC
uppbeat.io/t/danijel-zambo/st...
License code: GP7G16RFOLJZTBYN
#git #github #learngit #gitrebase #git #development #softwareengineering #programming #coding #versioncontrol #developer #technology #tutorial #stepbystepguide #gitrepository #vcs #programmingtips #codersofinstagram #codingcommunity #learnprogramming #softwaredevelopment #codingtutorial #gitexplained

Пікірлер: 30

@themoderncoder 11 ай бұрын

MORE GIT VIDEOS: kzfaq.info/sun/PLfU9XN7w4tFwKwh_xPSQ_X1-hROQEpHnM

@ventin75 11 ай бұрын

The best git animation on youtube. Helps me to visualise what is happening. Looking forward to the next one.

@themoderncoder 11 ай бұрын

Appreciate it, and thanks for following my vids!

@sly-ryder-dietz 11 ай бұрын

Nice cliffhanger! I'm excited to learn what happens next!

@michaeleaster1815 11 ай бұрын

2:14 Subscribed. Thank you for the videos and esp. the animations: they are fantastic.

@themoderncoder 11 ай бұрын

Wow, appreciate that!

@adriananin3150 11 ай бұрын

Awesome video! Thanks

@noor_nee 11 ай бұрын

what are the odds ?! i just searched for a git rebase video and the video you uploaded about 5 years ago was the first result i saw. really loved the video btw; decided to checkout your other videos and then boom, a video about git rebase is the most recent!

@themoderncoder 11 ай бұрын

Thanks for taking the time to check out my other stuff! I can definitively say my newer videos are leaps and bounds higher quality than my older stuff, and I’m really trying to bring awareness to that, so I appreciate you checking it out!

@sanjayplays5010 10 ай бұрын

Definitely earned that sub, great video and succinct explanation ;)

@themoderncoder 10 ай бұрын

Thanks for the sub!

@ShivamSharma7 11 ай бұрын

Amazing Zack :)

@pascualrosario8633 7 ай бұрын

really nice video!

@themoderncoder 7 ай бұрын

Thanks!

@rayenchtioui8188 11 ай бұрын

thank you

@abdelazizez-zahed5009 12 күн бұрын

gooog

@francescopisu1568 9 ай бұрын

At 2:52 we've already done git rebase main while on the feature_branch ?

@themoderncoder 8 ай бұрын

Yeah, that would be one scenario. The other scenario could be that no other changes were pushed to main while the feature branch was in development

@commitsovercoffee 11 ай бұрын

How do you make these animations. They look lovely :D

@themoderncoder 11 ай бұрын

Appreciate it! I create the graphics in Sketch, then I use keyframe animations in Final Cut Pro to animate them.

@learner8084 9 ай бұрын

What is there are unstaged files in the feature branch ? Is the rebase update that file, but the files are not committed, then ?

@themoderncoder 9 ай бұрын

If there are upstaged changes in the working directory then rebase will fail and you'll need to either stash or commit those changes to continue rebasing.

@GizmoMaltese 9 ай бұрын

I don't get it. What if one of the files you're changing has been updated by someone else? How does rebase work there?

@themoderncoder 9 ай бұрын

You’ll get a conflict (just like you would during a merge) and you’ll need to tell Git how to incorporate the other person’s changes

@ChrisAthanas 11 ай бұрын

The second video in the series is marked PRIVATE Is that on purpose?

@themoderncoder 11 ай бұрын

Do you have more details?

@cFyugThCzvAqYaGmxRgfCKTuvHMEjQ 11 ай бұрын

I don't think I saw a pitfall here - what did I miss?

@themoderncoder 11 ай бұрын

Rebasing a branch that is shared by other contributors is the pitfall. If someone else has your feature_branch pulled into their local workspace then rebasing it will cause issues for them. Since rebase works by erasing then re-creating commits, you can cause yourself and your teammates synchronization problems by rebasing shared branches/commits.

@greyshopleskin2315 4 ай бұрын

@@themoderncoderhow would you resolve a situation like that, it is a bit confusing

@greyshopleskin2315 4 ай бұрын

@@themoderncoderi guess it would be to rebase your new commits into the remote branch