Branches & Merging

Branches let you work on features independently. Merge combines changes from different branches.

Syntax

GIT

1
2
3
4

git branch feature
git checkout feature
git checkout main
git merge feature

Branching and Merging

BASH

1
2
3
4
5
6
7
8
9
10
11
12
13
14

# Create and switch to branch
git checkout -b feature-login

# List branches
git branch

# Switch branch
git checkout main

# Merge branch
git merge feature-login

# Delete branch
git branch -d feature-login

Try It Yourself

Practice

1

Exercise

How do you create and switch to a new branch?

Answer

git checkout -b branch-name

Quick Quiz

1

What does "git merge" do?

Deletes a branch

Combines changes from branches

Creates a tag

Stashes changes

git merge combines changes from one branch into another.

Retry Quiz

Interview Questions

What is a merge conflict?

When Git cannot automatically merge changes from two branches because the same lines were modified.

Tutorial Complete

Back to Git