BiteSizedChunks.comLearn one small thing at a time.

Course contentsShow

Software Engineering

43What is Version Control and Why Git?
44Installing and Configuring Git
45Creating Your First Repository
46The Three States: Working Directory, Staging Area, and Repository
47Staging Changes with 'git add'
48Committing Changes with 'git commit'
49Viewing History with 'git log'
50Understanding Git Objects: Blobs, Trees, and Commits
51Checking Status and Differences
52Ignoring Files with .gitignore
53Undoing Changes: Restore and Reset Basics
54Cloning Existing Repositories
55Understanding Git Branches
56Creating and Switching Branches
57Branch Naming Conventions
58Fast-Forward Merges
59Three-Way Merges
60Merge Conflicts
61Resolving Merge Conflicts
62Merge vs Rebase
63Deleting and Cleaning Up Branches
64Merge Strategies and Options
65Understanding Git History as a DAG
66Viewing and Navigating History with git log
67Amending Commits
68Interactive Rebase for History Cleanup
69Cherry-Picking Commits
70The Reflog: Git's Safety Net
71When to Rewrite History vs. Create New Commits
72Force Push and Its Dangers
73What Are Remote Repositories
74Cloning a Repository
75Adding and Viewing Remotes
76Fetching Changes
77Pulling Changes
78Pushing Changes
79Tracking Branches
80Handling Push Rejections
81Working with Multiple Remotes
82What Are Branching Strategies and Why Do They Matter
83Trunk-Based Development
84Git Flow: Feature, Develop, Release, and Hotfix Branches
85GitHub Flow: Simplified Branch-and-Merge
86GitLab Flow: Environment Branches and Release Branches
87Release Branching vs Continuous Deployment
88Choosing a Strategy for Your Team
89Branch Naming Conventions and Policies

Software Engineering

43What is Version Control and Why Git?
44Installing and Configuring Git
45Creating Your First Repository
46The Three States: Working Directory, Staging Area, and Repository
47Staging Changes with 'git add'
48Committing Changes with 'git commit'
49Viewing History with 'git log'
50Understanding Git Objects: Blobs, Trees, and Commits
51Checking Status and Differences
52Ignoring Files with .gitignore
53Undoing Changes: Restore and Reset Basics
54Cloning Existing Repositories
55Understanding Git Branches
56Creating and Switching Branches
57Branch Naming Conventions
58Fast-Forward Merges
59Three-Way Merges
60Merge Conflicts
61Resolving Merge Conflicts
62Merge vs Rebase
63Deleting and Cleaning Up Branches
64Merge Strategies and Options
65Understanding Git History as a DAG
66Viewing and Navigating History with git log
67Amending Commits
68Interactive Rebase for History Cleanup
69Cherry-Picking Commits
70The Reflog: Git's Safety Net
71When to Rewrite History vs. Create New Commits
72Force Push and Its Dangers
73What Are Remote Repositories
74Cloning a Repository
75Adding and Viewing Remotes
76Fetching Changes
77Pulling Changes
78Pushing Changes
79Tracking Branches
80Handling Push Rejections
81Working with Multiple Remotes
82What Are Branching Strategies and Why Do They Matter
83Trunk-Based Development
84Git Flow: Feature, Develop, Release, and Hotfix Branches
85GitHub Flow: Simplified Branch-and-Merge
86GitLab Flow: Environment Branches and Release Branches
87Release Branching vs Continuous Deployment
88Choosing a Strategy for Your Team
89Branch Naming Conventions and Policies

← Software Engineering

Lesson 59 of 1,933·2. Version Control with GitPro lesson

Three-Way Merges

Learn how Git performs three-way merges when branches have diverged, creating a new merge commit with two parents.

This lesson is for subscribers

You've completed the free preview. Subscribe to unlock every lesson in every course.

See pricing Back to course