Branching and merging in Figma - Real Business Scenario

Scenario Mode

👤 Your Role: You are a product designer working in a team using Figma for UI design.

📋 Request: Your manager wants you to create a new feature design while keeping the original design intact. Later, you need to merge your changes back into the main design file.

📊 Data: You have the main design file with the current UI screens. You will create a branch to work on the new feature design separately.

🎯 Deliverable: A merged Figma design file that includes the new feature changes integrated into the main design.

Sample Data

Screen Name	Elements	Status
Login Screen	Username field, Password field, Login button	Main design
Dashboard	Navigation bar, Summary cards, Notifications	Main design
Settings	Profile info, Preferences, Logout button	Main design

1

Step 1: Create a branch from the main design file to work on the new feature.

In Figma, open the main design file. Click on the file name, then select 'Create branch'. Name the branch 'New Feature Design'.

Expected Result

A new branch named 'New Feature Design' is created, duplicating the main design for safe editing.

2

Step 2: Make your design changes for the new feature in the branch.

Add new UI elements or modify existing screens in the 'New Feature Design' branch without affecting the main file.

Expected Result

The branch contains updated screens with the new feature design changes.

3

Step 3: Review your changes and prepare to merge them back into the main design.

Use Figma's branch comparison tool to see differences between the branch and main file.

Expected Result

You can clearly see the new feature changes highlighted compared to the main design.

4

Step 4: Merge the branch back into the main design file.

In Figma, select the branch, then click 'Merge into main'. Resolve any conflicts if prompted.

Expected Result

The main design file now includes the new feature changes from the branch.

5

Step 5: Verify the merged design in the main file.

Open the main design file and check that all new feature elements are present and correctly integrated.

Expected Result

The main design file shows the updated UI with the new feature ready for team use.

Final Result

Main Design File
+-----------------------------+
| Login Screen                |
| - Username field            |
| - Password field            |
| - Login button              |
|                             |
| Dashboard                   |
| - Navigation bar            |
| - Summary cards             |
| - Notifications             |
|                             |
| Settings                   |
| - Profile info              |
| - Preferences               |
| - Logout button             |
|                             |
| New Feature Screen          |
| - New UI elements added     |
+-----------------------------+

✓Branching allows safe experimentation without affecting the main design.

✓Merging integrates new changes smoothly after review.

✓Figma's branching and merging help teams collaborate efficiently on UI design.

Bonus Challenge

Create a second branch to test an alternative design for the new feature and compare it with the first branch before merging.

Show Hint

Use Figma's branch comparison to review differences side-by-side and decide which design to merge.

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