正在加载视频...

视频加载失败

返回首页

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...

sahnlam's profile picture

Sahn Lam

48,880 subscribers

65,160 次观看 • 2 年前 •via X (Twitter)

新闻政治科学技术教育
LIVE

Anya Rossi• Live Now

Private livecam show

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. 🙏

相关视频

A DEVELOPER MADE A REAL COMMIT WITHOUT EVER TYPING GIT ADD OR GIT COMMIT -- JUST TO PROVE THE COMMANDS YOU LIVE BY ARE A THIN SHELL OVER A DATABASE YOU'VE NEVER ONCE OPENED 55 minutes from Tim Berglund, a longtime Git teacher and GitHub evangelist, taking the tool apart down to the raw objects almost nobody who uses it every day has ever touched. -> The moment it clicks, Git stops being a pile of memorized commands and becomes what it actually is underneath: a tiny content-addressed database of blobs, trees and commits. git add and git commit are just polite wrappers around writing objects into it by hand. Every commit you've ever made was Git hashing a snapshot and filing it by fingerprint. Branches are just labels pointing at one of those objects. The work you thought you destroyed with a bad reset is still sitting in the reflog. Once you can see that graph, the commands that used to terrify you stop being scary at all. Memorizing commands was never the skill -> reading the object graph in your head is. And with an AI agent now committing and rebasing on your machine faster than you can follow, the one person who can untangle the mess it leaves is the one who knows what's really stored down there. There's a person on every team everyone runs to when Git breaks. This is the talk that quietly turns you into them. You'll reach for it the next time a rebase goes sideways. Bookmark & Watch it today ↓
55:19

A DEVELOPER MADE A REAL COMMIT WITHOUT EVER TYPING GIT ADD OR GIT COMMIT -- JUST TO PROVE THE COMMANDS YOU LIVE BY ARE A THIN SHELL OVER A DATABASE YOU'VE NEVER ONCE OPENED 55 minutes from Tim Berglund, a longtime Git teacher and GitHub evangelist, taking the tool apart down to the raw objects almost nobody who uses it every day has ever touched. -> The moment it clicks, Git stops being a pile of memorized commands and becomes what it actually is underneath: a tiny content-addressed database of blobs, trees and commits. git add and git commit are just polite wrappers around writing objects into it by hand. Every commit you've ever made was Git hashing a snapshot and filing it by fingerprint. Branches are just labels pointing at one of those objects. The work you thought you destroyed with a bad reset is still sitting in the reflog. Once you can see that graph, the commands that used to terrify you stop being scary at all. Memorizing commands was never the skill -> reading the object graph in your head is. And with an AI agent now committing and rebasing on your machine faster than you can follow, the one person who can untangle the mess it leaves is the one who knows what's really stored down there. There's a person on every team everyone runs to when Git breaks. This is the talk that quietly turns you into them. You'll reach for it the next time a rebase goes sideways. Bookmark & Watch it today ↓

slash1s

224,970 次观看 • 4 天前

Our GitHub integration just got a major upgrade: • Every code change generates a commit • Open PRs and merge directly from chat • New in-chat GitHub panel to connect, see sync status, branches and commits. • Improved flow to connect a chat to a repo
0:35

Our GitHub integration just got a major upgrade: • Every code change generates a commit • Open PRs and merge directly from chat • New in-chat GitHub panel to connect, see sync status, branches and commits. • Improved flow to connect a chat to a repo

v0

14,799 次观看 • 4 个月前

MIT DEDICATED A FULL LECTURE TO GIT'S INTERNALS -- BECAUSE THEY FOUND MOST DEVS MEMORIZE THE COMMANDS AND HAVE NO IDEA WHAT THE TOOL ACTUALLY DOES A whole 85 minutes MIT session that refuses to teach git as a list of commands to copy, and instead shows you the data model underneath -- the thing that makes every command finally make sense. -> The moment it clicks, git stops being scary magic. You stop memorizing "The incantation that fixed it last time" and start actually knowing what's happening. Most people learn just enough git to not get fired. Four commands, blind faith, and a prayer before every merge. In 2026 that's not enough anymore -> git is the literacy test for being in the room, and "I'll just reclone it" is the fastest way to look junior. An AI agent will branch, commit and rebase faster than you can read. When it tangles the history, untangling it runs on understanding the model MIT teaches in this one hour. Anyone can run git push. The person who understands the graph underneath is the one who saves the repo when it breaks. Bookmark & Watch it ↓
1:24:59

MIT DEDICATED A FULL LECTURE TO GIT'S INTERNALS -- BECAUSE THEY FOUND MOST DEVS MEMORIZE THE COMMANDS AND HAVE NO IDEA WHAT THE TOOL ACTUALLY DOES A whole 85 minutes MIT session that refuses to teach git as a list of commands to copy, and instead shows you the data model underneath -- the thing that makes every command finally make sense. -> The moment it clicks, git stops being scary magic. You stop memorizing "The incantation that fixed it last time" and start actually knowing what's happening. Most people learn just enough git to not get fired. Four commands, blind faith, and a prayer before every merge. In 2026 that's not enough anymore -> git is the literacy test for being in the room, and "I'll just reclone it" is the fastest way to look junior. An AI agent will branch, commit and rebase faster than you can read. When it tangles the history, untangling it runs on understanding the model MIT teaches in this one hour. Anyone can run git push. The person who understands the graph underneath is the one who saves the repo when it breaks. Bookmark & Watch it ↓

slash1s

210,232 次观看 • 1 天前

HARVARD RELEASED A 65-MIN MASTERCLASS ON GIT & GITHUB BECAUSE VIBE-CODERS STILL DON'T KNOW HOW TO COMMIT 1 hour and 5 minutes of raw, no-nonsense version control architecture from the creators of CS50. -> The moment you watch it, you realize why most modern developers are breaking their production branches. Every tier-1 tech company is now filtering candidates who can't handle basic merge conflicts. Git isn't a "nice-to-know" anymore -> it's compliance. Your AI can write the code. That wasn't the problem. The problem is you don't know how to merge it without breaking the repo. Don’t forget to bookmark it.
1:05:58

HARVARD RELEASED A 65-MIN MASTERCLASS ON GIT & GITHUB BECAUSE VIBE-CODERS STILL DON'T KNOW HOW TO COMMIT 1 hour and 5 minutes of raw, no-nonsense version control architecture from the creators of CS50. -> The moment you watch it, you realize why most modern developers are breaking their production branches. Every tier-1 tech company is now filtering candidates who can't handle basic merge conflicts. Git isn't a "nice-to-know" anymore -> it's compliance. Your AI can write the code. That wasn't the problem. The problem is you don't know how to merge it without breaking the repo. Don’t forget to bookmark it.

slash1s

249,033 次观看 • 18 天前

You don't need to memorize a dozen Git commands on day one. Start with the visual tools in VS Code, learn what commits and branches actually do, and build from there. That's exactly what we're covering in our latest GitHub for Beginners episode.
0:39

You don't need to memorize a dozen Git commands on day one. Start with the visual tools in VS Code, learn what commits and branches actually do, and build from there. That's exactly what we're covering in our latest GitHub for Beginners episode.

GitHub

23,677 次观看 • 4 天前

Try this Git developer challenge: a bug appeared somewhere in the last 500 commits, and you have a test that detects it. What’s the shortest path to find the exact commit where it was introduced? Share your answer in the comments.
0:34

Try this Git developer challenge: a bug appeared somewhere in the last 500 commits, and you have a test that detects it. What’s the shortest path to find the exact commit where it was introduced? Share your answer in the comments.

Google for Developers

16,397 次观看 • 1 个月前

This might be the TUI of the year ⭐ 🎬 gitlogue — A cinematic Git commit replay tool for the terminal. ⚡ Watch commits unfold with typing animations, syntax highlighting and a live-updating file tree. 🤯 Watch your repo code itself. 🦀 Written in Rust & built with Ratatui ⭐ GitHub: #rustlang #ratatui #tui #git #commits #replay #terminal #screensaver
2:40

This might be the TUI of the year ⭐ 🎬 gitlogue — A cinematic Git commit replay tool for the terminal. ⚡ Watch commits unfold with typing animations, syntax highlighting and a live-updating file tree. 🤯 Watch your repo code itself. 🦀 Written in Rust & built with Ratatui ⭐ GitHub: #rustlang #ratatui #tui #git #commits #replay #terminal #screensaver

Orhun Parmaksız 👾

32,130 次观看 • 6 个月前

Introducing the new v0 & GitHub integration. - Import any repo and work on your actual codebase - Every code change generates a commit - Open PRs and merge directly from v0 - v0 handles branches automatically
0:54

Introducing the new v0 & GitHub integration. - Import any repo and work on your actual codebase - Every code change generates a commit - Open PRs and merge directly from v0 - v0 handles branches automatically

v0

14,595 次观看 • 4 个月前

Two decades. Countless commits. Approximately one billion merge conflicts. Happy birthday to our favorite little version control system, Git! 🥳
0:26

Two decades. Countless commits. Approximately one billion merge conflicts. Happy birthday to our favorite little version control system, Git! 🥳

GitHub

79,778 次观看 • 1 年前

Squash will be one of the five new and returning sports to feature at Los Angeles 2028! 🤩 Watch the video to see what Team USA squash player Amanda Sobhy keeps in her bag. 👜 World Squash Team USA LA28
0:50

Squash will be one of the five new and returning sports to feature at Los Angeles 2028! 🤩 Watch the video to see what Team USA squash player Amanda Sobhy keeps in her bag. 👜 World Squash Team USA LA28

The Olympic Games

34,949 次观看 • 1 年前

THE CO-FOUNDER OF GITHUB GAVE A 46-MINUTE TALK ON GIT BECAUSE ENGINEERS WITH 10 YEARS IN HAVE NEVER SEEN HALF OF WHAT IT DOES This is Scott Chacon. He wrote Pro Git -- the book most devs secretly learned Git from and he co-founded GitHub. So when he says you're missing things, you're missing things. About ten minutes in it clicks: half the "git disasters" you've ever fixed by deleting the folder and re-cloning had a one-line solution sitting in the tool the whole time. Git ships new code almost every day -> roughly nine commits a day for over a decade. Most of us stopped learning it the second we memorized add, commit, push. Knowing Git isn't a senior-dev flex anymore -> it's the floor. The agent writes the code now. Your real job is reading, branching, and untangling the history it leaves behind. The day an AI agent force-pushes over your main branch, these 46 minutes are the difference between a quiet fix and a very loud apology. Save it now. You'll reach for it sooner than you'd like ↓
46:04

THE CO-FOUNDER OF GITHUB GAVE A 46-MINUTE TALK ON GIT BECAUSE ENGINEERS WITH 10 YEARS IN HAVE NEVER SEEN HALF OF WHAT IT DOES This is Scott Chacon. He wrote Pro Git -- the book most devs secretly learned Git from and he co-founded GitHub. So when he says you're missing things, you're missing things. About ten minutes in it clicks: half the "git disasters" you've ever fixed by deleting the folder and re-cloning had a one-line solution sitting in the tool the whole time. Git ships new code almost every day -> roughly nine commits a day for over a decade. Most of us stopped learning it the second we memorized add, commit, push. Knowing Git isn't a senior-dev flex anymore -> it's the floor. The agent writes the code now. Your real job is reading, branching, and untangling the history it leaves behind. The day an AI agent force-pushes over your main branch, these 46 minutes are the difference between a quiet fix and a very loud apology. Save it now. You'll reach for it sooner than you'd like ↓

slash1s

27,380 次观看 • 8 天前

There are times when delay is the most dangerous form of decision. That is why I am proposing a Competitiveness Handshake today. The Council, the Commission and the Parliament must all commit to one simple principle: no new net burden on European businesses. We all need to commit to making the EU work better for business.
0:40

There are times when delay is the most dangerous form of decision. That is why I am proposing a Competitiveness Handshake today. The Council, the Commission and the Parliament must all commit to one simple principle: no new net burden on European businesses. We all need to commit to making the EU work better for business.

Ebba Busch

42,931 次观看 • 3 个月前

💧SCALLOP FEATURE - veSCA Merge & Split We are thrilled to introduce Scallop's latest feature, veSCA Merge and Split! This new feature provides Scallopers with the option to merge or split their different veSCA keys seamlessly, based on different needs and use cases! With this new feature update, Scallopers can perform the following actions: - Merge / Split veSCA - Manage multiple veSCA keys - Switching veSCA across multiple obligations With the ability to be split or merged into any size, veSCA is now as dynamic as a typical coin asset! 🎁Loyalty Program BONUS Airdrop Scallopers who claim and staked their SCA rewards in our recent loyalty program will receive a BONUS airdrop of 500,000 veSCA! Eligible Criteria: Hold at least 2,500 veSCA The bonus airdrop will be distributed in veSCA keys, with maximum lock duration of 4 years. Eligible Scallopers can claim their veSCA reward and choose to merge their new veSCA with their existing veSCA key! More Details Here:
0:31

💧SCALLOP FEATURE - veSCA Merge & Split We are thrilled to introduce Scallop's latest feature, veSCA Merge and Split! This new feature provides Scallopers with the option to merge or split their different veSCA keys seamlessly, based on different needs and use cases! With this new feature update, Scallopers can perform the following actions: - Merge / Split veSCA - Manage multiple veSCA keys - Switching veSCA across multiple obligations With the ability to be split or merged into any size, veSCA is now as dynamic as a typical coin asset! 🎁Loyalty Program BONUS Airdrop Scallopers who claim and staked their SCA rewards in our recent loyalty program will receive a BONUS airdrop of 500,000 veSCA! Eligible Criteria: Hold at least 2,500 veSCA The bonus airdrop will be distributed in veSCA keys, with maximum lock duration of 4 years. Eligible Scallopers can claim their veSCA reward and choose to merge their new veSCA with their existing veSCA key! More Details Here:

Scallop

19,111 次观看 • 1 年前

I genuinely believe GitHub desktop is the best Git client for most people The design is simple but it's excellent for day to day work of swapping branches, cherry picking, undoing commits, stashing, previewing PRs - one of their best products
0:38

I genuinely believe GitHub desktop is the best Git client for most people The design is simple but it's excellent for day to day work of swapping branches, cherry picking, undoing commits, stashing, previewing PRs - one of their best products

Rhys

729,833 次观看 • 5 个月前

git commit -m “OnlyDevs” git push origin main 🇮🇳
0:30

git commit -m “OnlyDevs” git push origin main 🇮🇳

Superteam India

46,315 次观看 • 8 个月前

trying a TDD + git workflow npm i task-master-ai → test-driven development → github branch for each task → commit + test each subtask once done → push PR when task is feature complete → full code coverage → nearly autopilot will polish and ship as rules first then as a feature
5:41

trying a TDD + git workflow npm i task-master-ai → test-driven development → github branch for each task → commit + test each subtask once done → push PR when task is feature complete → full code coverage → nearly autopilot will polish and ship as rules first then as a feature

Eyal Toledano

14,586 次观看 • 1 年前

#WATCH | Chennai, Tamil Nadu: On TVK election manifesto, TVK Candidate Sathya Kumar says, "... We are the first state in the entire country to commit to a new ministry. Ministry for AI is prevalent in the UAE, Europe and the US. We are the first state, first party, as part of an election manifesto, to commit to a separate ministry for AI..."
4:24

#WATCH | Chennai, Tamil Nadu: On TVK election manifesto, TVK Candidate Sathya Kumar says, "... We are the first state in the entire country to commit to a new ministry. Ministry for AI is prevalent in the UAE, Europe and the US. We are the first state, first party, as part of an election manifesto, to commit to a separate ministry for AI..."

ANI

40,706 次观看 • 1 个月前

We built a visual canvas for tracking changes and experimenting with claude code. Describe your change → auto-commit with git → view a preview of that change → drag and drop a new branch to keep experimenting. It's called Cascade and here's how it works...
0:25

We built a visual canvas for tracking changes and experimenting with claude code. Describe your change → auto-commit with git → view a preview of that change → drag and drop a new branch to keep experimenting. It's called Cascade and here's how it works...

Avinash

25,031 次观看 • 8 个月前

2023 was another successful year on the diamond as we saw 13 student-athletes commit to playing baseball at the next level! - 5 DI commits - 2 DII commits - 3 DIII commits - 3 JUCO commits - 13 young men with bright futures ahead of them! Congrats to each & every one of you!
0:42

2023 was another successful year on the diamond as we saw 13 student-athletes commit to playing baseball at the next level! - 5 DI commits - 2 DII commits - 3 DIII commits - 3 JUCO commits - 13 young men with bright futures ahead of them! Congrats to each & every one of you!

Thunderwolves Baseball Recruiting

10,051 次观看 • 2 年前