Branching and merging in Figma - Practice Problems & Coding Challenges

Challenge - 5 Problems

🧠 Conceptual

intermediate

Understanding Branching in Figma

What is the primary purpose of creating a branch in Figma when working on a design project?

A To export the design file as a PDF

B To create a separate copy of the design file to work on changes without affecting the main file

C To merge two unrelated design files into one automatically

D To permanently delete the original design file

💡 Hint

Think about how you can work safely on new ideas without changing the original design.

Branching allows designers to create a separate copy of the design file to experiment or make changes without impacting the main design. This helps in safe collaboration and testing.

🎯 Scenario

intermediate

Merging Branches in Figma

You have finished working on a branch in Figma and want to combine your changes back into the main file. What happens during the merge process?

A Your changes are reviewed and then integrated into the main file, resolving any conflicts if necessary

B The branch is deleted without saving any changes

C The main file is overwritten without any review

D A new unrelated file is created

💡 Hint

Consider how merging helps keep the main file updated with your branch work safely.

Merging in Figma involves reviewing changes made in the branch and integrating them into the main file. If there are conflicts, they must be resolved to ensure design consistency.

🔧 Formula Fix

advanced

Resolving Merge Conflicts

During a merge in Figma, you encounter a conflict where two designers changed the same button color differently. What is the best way to resolve this conflict?

A Choose the color that fits the design guidelines and communicate with the team before finalizing

B Delete the button to avoid confusion

C Ignore the conflict and merge anyway

D Duplicate the button with both colors side by side

💡 Hint

Think about teamwork and design consistency when resolving conflicts.

Conflicts should be resolved by selecting the option that aligns with design standards and discussing with the team to maintain consistency and clarity.

❓ visualization

advanced

Visualizing Branch History

Which Figma feature helps you see the history of changes made in a branch and compare it with the main file?

A Export to PNG

B Auto-layout tool

C Branch comparison view showing changes side-by-side

D Prototype mode

💡 Hint

Look for a feature that helps review differences between versions.

The branch comparison view in Figma allows you to see changes made in a branch compared side-by-side with the main file, helping in review and merge decisions.

❓ data_modeling

expert

Design System Updates with Branching

You are updating a shared design system in Figma using branches. What is the best practice to ensure all team members get the latest components without breaking their current work?

A Delete old components before merging updates

B Directly edit the main design system without branches

C Send screenshots of changes instead of updating components

D Create a branch for updates, test changes thoroughly, then merge to main and notify the team to pull updates

💡 Hint

Think about safe updates and communication in shared resources.

Using branches to update the design system allows testing changes without affecting others. After merging, notifying the team ensures everyone uses the latest components safely.

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