I first seen your merge vs rebase a couple days ago and it really helped explain. UA-cam seemed to agree and recommended me this straight after uploading (im not subscribed), and again really helpful video. Gonna have to check out more!
Good to hear. These videos end up taking way longer than I think to film and animate, so it really makes me feel like it’s worth it when I get comments like yours.
thanks for your videos :) helps alot! i use git for some time now (private and in my company) and sometimes we have some issues with the git stuff, and your videos really help :) keep on the good work
Appreciate it my guy! I’m still grinding - these deep dive vids take an ungodly amount of time so it’s hard to get even one out every month or two. But I’m committed to it.
This video is awesome! Sadly I am not able to see the difference between git pull (without option) and git pull --ff. Both strategies seems to merge if it's not possibile to do a fast-forward-merge. If git pull (without option) is basically git fetch + git merge, what is git pull-ff? It looks the same to me. What am I missing? thanks.
"git pull" is always "git fetch" followed by "git merge" behind the scenes regardless of what merging option is specified. The "--ff" option is simply forwarded to "git merge" behind the scenes. Since "--ff" is the default merging strategy, if no command line flag is provided, there is no difference between "git pull" and "git pull --ff" unless you specify an alternative default (like in 5:47 in the video).
Sure. Below is the relevant part of my ~/.zshrc, and the font used is Iosevka: # Load version control information autoload -Uz vcs_info precmd() { vcs_info } # Format the vcs_info_msg_0_ variable zstyle ':vcs_info:git:*' formats '%F{215} %b%f' # Format the prompt setopt PROMPT_SUBST PS1=$'%F{69}%n%f on %F{cyan}%~%f ${vcs_info_msg_0_} \Uf0da '
You are the git goat with your visualizations.
he is the git goat and you need to git gud.
My guy at the very beginning when you described git pull as being a combination of fetch and merge...it already instantly clicked for me xD thank you!
Yeah, I use Visual Studio and it hides this detail from you. Good video.
I first seen your merge vs rebase a couple days ago and it really helped explain. UA-cam seemed to agree and recommended me this straight after uploading (im not subscribed), and again really helpful video. Gonna have to check out more!
Good to hear. These videos end up taking way longer than I think to film and animate, so it really makes me feel like it’s worth it when I get comments like yours.
@@themoderncoder the time spent is worth it. You are creating a better world for software devs
Fantastic explanation, resolved all my confusion about merging. Thanks
thanks for your videos :) helps alot! i use git for some time now (private and in my company) and sometimes we have some issues with the git stuff, and your videos really help :) keep on the good work
Appreciate you saying that :)
Amazing man! Please don't stop making videos like this!
Appreciate it my guy! I’m still grinding - these deep dive vids take an ungodly amount of time so it’s hard to get even one out every month or two. But I’m committed to it.
Great video!! I was asked this in a interview!! I have been using git for years without this knowledge Thank you!!
Sweet! Glad it helped.
You always have great videos. Keep it up!
This is a clear explanation. Very good.
What tool do you make your visualizations with? They are very good
Thank you for your great tutorials. I'm curious will you make a video about 'git submodule'?
I can certainly add it to the roadmap!
This video is awesome! Sadly I am not able to see the difference between git pull (without option) and git pull --ff. Both strategies seems to merge if it's not possibile to do a fast-forward-merge. If git pull (without option) is basically git fetch + git merge, what is git pull-ff? It looks the same to me. What am I missing? thanks.
"git pull" is always "git fetch" followed by "git merge" behind the scenes regardless of what merging option is specified. The "--ff" option is simply forwarded to "git merge" behind the scenes. Since "--ff" is the default merging strategy, if no command line flag is provided, there is no difference between "git pull" and "git pull --ff" unless you specify an alternative default (like in 5:47 in the video).
Thank you
Great video :)
Great class! Thank you!🙏🏼
1:00-1:05 "... my local main branch hasn't changed". Light bulb on.
where's the dedicated video for side effect of git pull --rebase? no link appeared in the video
Sorry about that. The video I reference is this one: ua-cam.com/video/zOnwgxiC0OA/v-deo.html
perfect !!!
thanks for the video!
GIT GOAT. Thanks
Very useful :D
Mind sharing that terminal theme?
Sure. Below is the relevant part of my ~/.zshrc, and the font used is Iosevka:
# Load version control information
autoload -Uz vcs_info
precmd() { vcs_info }
# Format the vcs_info_msg_0_ variable
zstyle ':vcs_info:git:*' formats '%F{215} %b%f'
# Format the prompt
setopt PROMPT_SUBST
PS1=$'%F{69}%n%f on %F{cyan}%~%f ${vcs_info_msg_0_}
\Uf0da '
@@themoderncoder Thanks!
Exit vim, with save ZZ, exit vim without save ZQ
Not first but second
Let’s go! I never get “first” or “second” comments on my vids!!