if i clearly understand fast-forward performed when common ancestor of 2 branches is last commit of active branch, and already up to date is a situation when common ancestor is branch to merge last commit? for generalization to use finding common ancestor and choose merge strategy
and what performed in case if there are many branches and commits and merge commits beetween branches that i want to merge, it turns in deikstra algo on graphs to reach common ancestor?
Hello and thank you for your question :) It is indeed possible to perform a diff and apply a patch without using 3-way merge. If you look at part 1 of this series - I showed a case where applying patches fail without relying on this common ancestor, and having a 3-way merge (with a common ancestor) solves it. I hope this is clear 🙏🏻
In case of more than 2 commits that you want to merge - These are called "octopus" merges and the answer is.. Long :) I recommend this post: www.freblogg.com/git-octopus-merge I hope it helps 🙏🏻
No, no no.... Why do you suddenly start to overlay everything you say in big letters like an american tv commercial? It only distracts from what you're trying to teach. You were doing these videos so well before, so please, don't do that. It's really annoying!
Thanks for your feedback. Do you mean the "live" subtitles? Or something else? Some viewers told me it'd help them concentrate, but I am open to feedback - and if many people feel the same way I'll definitely adjust
Best channel to cover git internals
Thank you! 🙏🏻🙏🏻
Man you are simply great. Thank you for taking your time and effort for generating such invaluable contents.
Thank you so much for your kind words! Please help me share the word 🙏🏻
Thank you for so much dedication in sharing your knowledge.
Glad it was helpful! Thank you for your kind comment :)
Never came across something like this kind of presentation.!! I look forward to know more about git push, git fetch, git pull and git rebase
Thank you so much! Let me know if I covered everything you were hoping to see after the next couple of videos 🙏🏻
You do the best git videos on git! Great great thanks! I have shared your videos on my project.
Thank you so much! I am glad you liked them! More will come up soon
Hey, keep going. I like your videos. Greetings from Germany.
Vielen Dank @friedrichwilms95!
I will keep them up, promise :)
if i clearly understand fast-forward performed when common ancestor of 2 branches is last commit of active branch, and already up to date is a situation when common ancestor is branch to merge last commit? for generalization to use finding common ancestor and choose merge strategy
Indeed fast-forward happens when the common ancestor is `HEAD`.
I am not sure I understand your other question though. Can you please clarify?
Well explained
Thank you @vaharish!
why git cant calculate diff between two head commit of branches, and apply patch on active branch head commit? why i should find general ancestor?
and what performed in case if there are many branches and commits and merge commits beetween branches that i want to merge, it turns in deikstra algo on graphs to reach common ancestor?
Hello and thank you for your question :) It is indeed possible to perform a diff and apply a patch without using 3-way merge. If you look at part 1 of this series - I showed a case where applying patches fail without relying on this common ancestor, and having a 3-way merge (with a common ancestor) solves it. I hope this is clear 🙏🏻
In case of more than 2 commits that you want to merge - These are called "octopus" merges and the answer is.. Long :)
I recommend this post:
www.freblogg.com/git-octopus-merge
I hope it helps 🙏🏻
nice video! can you tell me the git command 'gg' alias for what ？
Thank you! You can find it in the descrption of the next video :)
ua-cam.com/video/BCNZ5Uxctuk/v-deo.html&ab_channel=Brief
No, no no.... Why do you suddenly start to overlay everything you say in big letters like an american tv commercial? It only distracts from what you're trying to teach. You were doing these videos so well before, so please, don't do that. It's really annoying!
Thanks for your feedback. Do you mean the "live" subtitles? Or something else?
Some viewers told me it'd help them concentrate, but I am open to feedback - and if many people feel the same way I'll definitely adjust