Video není dostupné.
Omlouváme se.
Git rebase basics
Vložit
- čas přidán 12. 08. 2024
- A lot of developers I met are confused about and even intimidated by git rebase. In this video I hope to explain it as simply as possible. I hope this is useful to you!
Buy me a coffee: www.buymeacoffee.com/teamprog...
Contents:
0:00 Short sketch - thank you XKCD!
0:15 White board explanation of what git rebase is
7:09 Practicing git rebase in a terminal
Next up: resolving conflicts with git rebase.
Follow me online:
LinkedIn: / alex-kovshovik
Twitter: / ashovik
Personal CZcams: / @alexkovshovik
Instagram: / alex.kovshovik
Facebook: / ashovik
Mastodon: mastodon.social/@alex_kovshovik
The best video on rebase on youtube ! Thanks a lot man !
thank you, bro. Watched your video after wasting 6 hours. I was just pushing using VS code after rebasing not force pushing. I almost quit programming. thank you so much
You are very welcome, bro! Don't give up programming :)
This is such good information from an unfinished shed with a whiteboard nailed to the wall.
I shall rename the channel to Barn Programmer :) LOL. Thanks David!
This is very informative. Your white board explanation gives a clear idea like what is happening with merge commit and rebasing wrt graph.Earlier I used to clone the new repo when I see something like "can't merge" in my PR. But now I can solve the things very easily and confidently with rebasing.Thank you so much... :)
Thank you so much for your kind comment!
Your intros are a scream! Love the humor.
Thanks a lot for having explain the need of force push instead of push!
This was useful... please keep up the good work!
Thank you! Very helpful!
THANKS man. Keep going and make more videos !!
Thank you so much for your video!!
Make more videos man. Your quality and editing is good and there's plenty more Git commands for video content.
I'm so sorry, have 4th child coming and I'm slammed at work lately :) Anyhow, thank you for your interest! I'm going to press forward!
You did an awesome job here! Let's make the next video!
An awesome explanation, bro!
Thanks bro!
please make related videos , its really helpful and thanks
great material Alex
Thank you!!!
very helpful thank u :)
main vs master . ahahahahha epic reference .
awesome video. thanks
You Are Awesome 👏👏👏👏
Are you git god?) Very helpful!
LOL, nope, just a man :D
this is so good "af"!!!!!!
This is awesome! I usually clone a new copy of the repo rather than rebasing 😝😂
Awesome 👏👏
Can you please show when we will get conflicts while rebasing and then how we can resolve and commit the changes
Sure! Please watch my next video after this one :)
@@teamprogrammer9650 did you have it already or are you the nicest guy in the world?
@@norbertomezzaucella9283 Already had it and yes, I am nice
Alrededores de 1:45
Ocurre nuevamente
Alrededor de 0:47
But he tamed the jumping beast and there's was no need to edit
"Make a copy of your local repo before rebase", or maybe just make a new branch and reset to it if you messed up the rebase.
Awesome explanation, can you tell me how you got your terminal looking the way it did?
Hey @WildDough, I used iTerm2 + a nice font "Fira Code" with ligatures enabled. Check out - it's pretty cool :)
thanks for simplified explanation, thisis great. one quick question, why do we need to run git rebase origin/main after updating out local main with git pull?
When you run "git fetch origin main", it doesn't update your local "main" branch - it only updates the local information about the remote "origin/main" branch. You run "git rebase origin/main" to update your local "main" using that info received with "fetch" command.
So what if I run git pull after git fetch, and rebase my local before pushing.. Does does this do the same thing?
@@michaeli5113 if you run the git pull, any remote changes will be added to you local branch: by either a merge commit or fast-forward (depending on your git client configuration). Merge commits are perfectly acceptable too, but if you’d like to keep your git commits nice and linear - you’re better off with rebase. This is explained more in my 2nd video (this channel)
I just subscribed thanks Zuckerberg!
First of all, thank you very much.
I want to know what was funny at 0:50?
Was about the sentence that started at 0:47?
Is it because AF could also mean _as f.u.c.k_?
I'm from Argentina and English isn't my first language.
Hi Norberto, thanks for your comment!
At 0:50 I named my branch "af" for "awesome feature", which in slang also means "as f*#k", to make it sound like "branch as f*#k" :)
So you are absolutely right and your English as great! I'm from Belarus, so my English isn't native either.
@@AlexKovshoviktell your compatriotas that there's already a country named Russia.
If the operator Bielo is is applied to russia, do you get una bellaRusia. Do you say you are cuter than them?
Venezuela sorry ass Venice?
The new england Patriots are almost an oxymoron
Were you in charge of edition?
Qué bueno que estuvo el comienzo!
Are you related to that child?
@@norbertomezzaucella9283 Belarus just sounds like bieloRussia, but it’s really a separate country.
Is there a Git cheat sheet somewhere?
Sure, lots of them. Lately you could even ask ChatGPT about exactly what you need git to do and it'll give you what you want. No more digging through documentation
@@teamprogrammer9650 I'm planning on setting up a bash script to do what I need.
I asked the guys that work with me if they have forced push something once ever
This sentence sounds like a sex joke LOL
@@teamprogrammer9650
me reí cómo tres o cuatro veces distintas.
Entonces te cuento una intimidad
Comenté lo que les dije para no hablar de la respuesta.. Para que quede una sensación de incompleto
Debe ser la primera vez que no hago la asociación de
forced
con
la categoría pornográfica
For being an intellectual ffuucckkiinngg teaser I was rewarded with funny interprétations now counting seex or fifes
Same problem as every video on the internet- some abstract diagram. Not a real story of what the code and problem looks like.
I'm sorry for having wasted your time. Please file a complaint with our public relations and the refund will be issued promptly.
af 😀