Branching and merging in Figma - Step-by-Step Guide

Introduction

Branching and merging in Figma lets you work on design changes separately without affecting the main file. This helps teams try new ideas safely and then combine the best changes back into the main design.

When you want to try a new design idea without changing the original file

When multiple team members need to work on different parts of a design at the same time

When you want to review changes before adding them to the main design

When you need to fix a bug or update a design without interrupting ongoing work

When preparing different versions of a design for client review

Steps

Step 1: Open the main Figma file

- Figma desktop app or web app

The main design file is visible on your screen

Step 2: Click the Branch button

- Top toolbar near the file name

A new branch is created, showing a copy of the main file for separate editing

💡 Name your branch clearly to describe the changes you plan to make

Step 3: Make your design changes

- In the new branch file

Your edits appear only in the branch, leaving the main file unchanged

Step 4: Click the Merge button

- Top toolbar in the branch file after finishing edits

A merge dialog opens to review changes before adding them to the main file

Step 5: Review changes and confirm merge

- Merge dialog

Your branch changes are combined into the main file, updating it with your edits

Step 6: Delete the branch if no longer needed

- Branch management panel

The branch is removed to keep the project organized

Before vs After

Before

Main file shows original design with no changes from the branch

After

Main file includes new design changes merged from the branch

Settings Reference

Branch name

📍 Branch creation dialog

Helps identify the purpose of the branch

Default: Untitled branch

Merge conflict resolution

📍 Merge dialog

Decide how to handle conflicting changes between branch and main file

Default: Manually edit

Branch deletion

📍 Branch management panel

Manage branches to avoid clutter

Default: Keep branch

Common Mistakes

Merging a branch without reviewing changes

This can introduce unwanted or incomplete edits into the main file

Always review the merge dialog carefully before confirming

Not naming branches clearly

Makes it hard to know what changes each branch contains

Use descriptive branch names that explain the purpose

Editing the main file while a branch is open

Can cause conflicts and confusion about which changes belong where

Keep edits separate by working only in the branch or main file at a time

Summary

Branching lets you work on design changes separately without affecting the main file

Merging combines your branch changes back into the main file after review

Always name branches clearly and review changes before merging to avoid mistakes

Practice

1. What is the main purpose of branching in Figma when working on a design file?

easy

A. To work on changes separately without affecting the main design

B. To delete the main design permanently

C. To share the design with external users

D. To export the design as an image

Solution

1. Step 1: Understand branching concept

   Branching allows designers to create a copy of the main design to work on changes safely.

2. Step 2: Identify the purpose of branching

   This lets you try new ideas without changing the original design until ready.

3. Final Answer:

   To work on changes separately without affecting the main design -> Option A

4. Quick Check:

   Branching = separate safe changes [OK]

Hint: Branching means working separately from main design [OK]

Common Mistakes:

• Thinking branching deletes the main design
• Confusing branching with exporting
• Assuming branching shares design externally

2. Which of the following is the correct sequence to merge a branch back into the main file in Figma?

easy

A. Make changes -> Merge branch -> Create branch

B. Merge branch -> Create branch -> Make changes

C. Create branch -> Make changes -> Merge branch into main

D. Create branch -> Merge branch -> Make changes

Solution

1. Step 1: Understand the workflow order

   You first create a branch to work separately, then make changes in it.

2. Step 2: Merge after changes are done

   Once changes are tested, you merge the branch back into the main file.

3. Final Answer:

   Create branch -> Make changes -> Merge branch into main -> Option C

4. Quick Check:

   Branch -> Change -> Merge [OK]

Hint: Branch first, then change, then merge back [OK]

Common Mistakes:

• Merging before making changes
• Creating branch after merging
• Changing main file directly without branch

3. If you create a branch from the main file and make changes to colors and text styles, what happens when you merge the branch back?

medium

A. The branch deletes the main file content

B. The main file updates with the new colors and text styles from the branch

C. The main file remains unchanged and ignores the branch changes

D. The main file duplicates the branch as a new file

Solution

1. Step 1: Understand merging effect

   Merging applies the changes made in the branch back into the main file.

2. Step 2: Identify what changes merge

   Colors and text styles changed in the branch will update the main file after merge.

3. Final Answer:

   The main file updates with the new colors and text styles from the branch -> Option B

4. Quick Check:

   Merging = update main with branch changes [OK]

Hint: Merge applies branch changes to main file [OK]

Common Mistakes:

• Thinking merge ignores branch changes
• Believing merge deletes main file
• Assuming merge creates duplicate files

4. You tried to merge a branch but received an error saying there are conflicts. What should you do to fix this?

medium

A. Delete the main file and try merging again

B. Create a new branch without resolving conflicts

C. Ignore the error and force merge

D. Review conflicting changes and resolve them before merging

Solution

1. Step 1: Understand merge conflicts

   Conflicts happen when changes in branch and main file overlap and differ.

2. Step 2: Resolve conflicts before merging

   You must review and fix these conflicting changes to merge safely.

3. Final Answer:

   Review conflicting changes and resolve them before merging -> Option D

4. Quick Check:

   Resolve conflicts before merge [OK]

Hint: Fix conflicts before merging branch [OK]

Common Mistakes:

• Forcing merge without resolving conflicts
• Deleting main file to fix conflicts
• Ignoring conflict errors

5. You have two designers working on separate branches: one changes layout, the other updates icons. How should you merge their work to keep the main file consistent?

hard

A. Merge one branch first, then update the other branch with main before merging it

B. Merge both branches at the same time without checking

C. Delete one branch and merge only the other

D. Merge branches in reverse order of creation

Solution

1. Step 1: Merge one branch first

   Start by merging the first designer's branch into the main file.

2. Step 2: Update second branch with main changes

   Before merging the second branch, update it with the latest main file to avoid conflicts.

3. Step 3: Merge the second branch

   After updating, merge the second branch safely into main.

4. Final Answer:

   Merge one branch first, then update the other branch with main before merging it -> Option A

5. Quick Check:

   Sequential merge with update avoids conflicts [OK]

Hint: Merge sequentially, update branches before merging [OK]

Common Mistakes:

• Merging both branches simultaneously causing conflicts
• Deleting branches instead of merging
• Ignoring updates before merging second branch