Загрузка видео...

Не удалось загрузить видео

На главную

Git Merge vs. Rebase vs. Squash Commit What are the differences and when should you use each? As I explain in more detail in the video, there are some key distinctions. Git Merge This creates a new commit in the target branch. The new commit ties the histories of...

65,160 просмотров • 2 лет назад •via X (Twitter)

Комментарии: 5

Фото профиля deepPurple
deepPurple2 лет назад

I tried git rebase and end up with unresolved merges (shared project) which doesn’t let me checkout to feature branch with some weird messages like currently rebasing cannot checkout. What am I doing wrong 😑

Фото профиля Abdellah
Abdellah2 лет назад

I contributed to one popular library and the maintainer asked me to do a rebase. It wasn't easy to do because this is a feature of git I have never used it. So, he finally did the rebase for me. This is beneficial content. Please where can more of it be found?

Фото профиля Deisbel (Sr. Software Developer)
Deisbel (Sr. Software Developer)2 лет назад

Good details. Thank you for sharing them. One thing, In 20+ years I have never needed to do a Rebase. I wonder how many of you out there have done anything different of a git merge?

Фото профиля Who Am I
Who Am I2 лет назад

+

Фото профиля Python Space
Python Space2 лет назад

Very well explained with great visuals. 🙏

Похожие видео

🚨 ENDORSEMENT 🚨 This morning, Fox & Friends weekend panel unanimously endorsed the Defend the Guard Act. H.B. 229, which passed the New Hampshire House of Representatives on Thursday, would prohibit the deployment of the state’s National Guard into overseas combat without a declaration of war from Congress. Pete Hegseth, a National Guardsman and veteran of both Iraq and Afghanistan, said “New Hampshire is simply pointing out that it’s supposed to be Congress that declares war. It has become an executive branch function, and as a result unless the Congress declares war, New Hampshire doesn’t have to send troops for foreign wars. To me it makes a lot of sense. I spent most of my career as a National Guardsman, deployed multiple times with the National Guard to foreign wars. We got used to the idea that state National Guard are part of expeditionary forces, which is not traditionally the use of a National Guard. And so this is New Hampshire saying we don’t trust how the federal government is going to use our troops, so we’re willing to commit them when the American people, through their elected branch in Congress, commits those troops to a foreign war, then you can. I love this idea. I’m sure the National Guard Bureau is [grumbles]. I love states exerting their influence through a system of federalism, and the idea of protecting the prerogative of—why are we sending some young guy from New Hampshire to the eastern province of Afghanistan when you have a northern border problem, or floods that happen in New Hampshire and they’re not there to provide support for that? It’s an interesting development, it’ll be interesting to see if other legislatures do this and how the military reacts to it.” Former White House Press Secretary Kayleigh McEnany asked “But why are states having to tell the federal government [to] abide by the letter of the Constitution? I love it as well, but it’s an unfortunate state of affairs when the states are having to say abide by the text.” Will Cain previously endorsed our bill when he interviewed our Chairman Dan McKnight while guest hosting Tucker Carlson Tonight.

Bring Our Troops Home

159,693 просмотров • 2 лет назад