Merge vs Rebase [Intermediate Git Tutorial]

preview_player
Показать описание

#git #gitkraken #gitclient #gitgui #learngit #programming #github #bitbucket #gitlab
Рекомендации по теме
Комментарии
Автор

what a great video. It really convinces me to use that product. Once i am a team lead I will definetely buy from you guys

AndresLeonRangel
Автор

Just say no to rebasing! The video pretty much makes that point, but it's still good to mention it explicitly. It obfuscates the actual history, which goes against the point of source code management. Especially a distributed SCM like Git, which is inherently incompatible with the concept of rewriting history. Complex branch graphs are not a problem, because we have the tools that help us work with them. That's one of the main reasons why nowadays we're no longer using CVS and SVN, but Git and Mercurial.

IntoxicCH
Автор

regarding 1:06
"Rebase will present conflicts one commit at a time whereas merge will present them all at once. It is better and much easier to handle the conflicts"

so...is she correct or not ?

Ris-vw
Автор

So the punchline of the video is NEVER REBASE

SNSDatDPRK
Автор

You're really glossing over this stuff because you know it so well. Fourth video and you're talking about 'commits'. What the hell is a commit? Poor tutorials.

onjofilms