Loading video...

Video Failed to Load

There was a problem loading this video. This could be due to a temporary network issue or the video might be unavailable.

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... both main and feature branches together. Git merge is non-destructive - it introduces a new commit without altering existing ones. Git Rebase Rebase transplants commits to the tip of another branch. It creates new commits for each one moved over. The benefit is linear history. But be cautious with shared branches to avoid confusing collaborators. Squash Commit Squashing condenses multiple commits into one, streamlining the commit history. Watch the video to see when to use merge vs rebase vs squash when incorporating changes between main and feature branches. – Subscribe to our weekly newsletter to get a Free System Design PDF (158 pages):show more

Sahn Lam

48,880 subscribers

65,160 views • 2 years ago •via X (Twitter)

News & Politics Science & Technology Education

Anya Rossi• Live Now

Private livecam show

5 Comments

deepPurple2 years ago

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 😑

Abdellah2 years ago

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)2 years ago

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 I2 years ago

+

Python Space2 years ago

Very well explained with great visuals. 🙏

Related Videos

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

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 views • 4 months ago

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.

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

248,342 views • 13 days ago

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.

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 views • 1 month ago

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

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 views • 6 months ago

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

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 views • 3 months ago

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

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

GitHub

79,778 views • 1 year ago

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

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 views • 1 year ago

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.

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 views • 3 months ago

💧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 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 views • 1 year ago

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

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 views • 5 months ago

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

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

Superteam India

46,315 views • 8 months ago

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

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 views • 1 year ago

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!

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 views • 2 years ago

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

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 views • 8 months ago

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

#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 views • 1 month ago

⭐ In 2005, Git made its first commit. ⏩ Fast-forward to 2025, we relive the birth of Git with the creator, Linus Torvalds. ❤️ Head down memory lane with us.

⭐ In 2005, Git made its first commit. ⏩ Fast-forward to 2025, we relive the birth of Git with the creator, Linus Torvalds. ❤️ Head down memory lane with us.

GitHub

257,585 views • 1 year ago

#1 Dreshaun Ross (OK State commit) wins the 285 lbs final at #Fargo2025 on criteria, 2*-2, over #2 Coby Merrill (Iowa State commit). A closing-seconds caution-and-one for fleeing sealed it in a heavyweight clash between the Big 12 commits.

#1 Dreshaun Ross (OK State commit) wins the 285 lbs final at #Fargo2025 on criteria, 2*-2, over #2 Coby Merrill (Iowa State commit). A closing-seconds caution-and-one for fleeing sealed it in a heavyweight clash between the Big 12 commits.

Saturday Night Lights

79,562 views • 10 months ago

🚨 SQUASH SKILLS! 💪 Squash will be one of five new and returning sports set to feature at the Olympic Games #LA28. 👀 Are you ready for new Olympic stars? 📹: mknudsenm (IG) #Olympics | #Squash | LA28 | World Squash

🚨 SQUASH SKILLS! 💪 Squash will be one of five new and returning sports set to feature at the Olympic Games #LA28. 👀 Are you ready for new Olympic stars? 📹: mknudsenm (IG) #Olympics | #Squash | LA28 | World Squash

The Olympic Games

31,939 views • 1 year ago

When the Buffalo Bills commit to consistently doing this It changes who they are, it changes who everyone in their offense is.

When the Buffalo Bills commit to consistently doing this It changes who they are, it changes who everyone in their offense is.

Dan Orlovsky

372,846 views • 2 years ago