Branching and merging in Figma - Cell-by-Cell Formula Trace

Sample Data

This data represents a simple example of branching and merging in Figma design versions. Column A shows the branch names, column B shows the changes made in each branch, and column C shows the result after merging.

Cell	Value
A1	Main Design
A2	Version 1
A3	Version 2
B1	Base Layout
B2	Added Button
B3	Changed Color
C1	Merged Design
C2	Base Layout + Button + Color Change

Formula Trace

Merged Design = Base Layout + Added Button + Changed Color

Step 1: Base Layout

Step 2: Base Layout + Added Button

Step 3: Base Layout with Button + Changed Color

Step 4: Merged Design

Cell Reference Map

    A           B                   C
1 | Main Design | Base Layout        | Merged Design
2 | Version 1   | Added Button       | Base Layout + Button + Color Change
3 | Version 2   | Changed Color      |

The formula uses the base layout from cell B1, adds the button from B2, and then applies the color change from B3 to create the merged design in C2.

Result

    A           B                   C
1 | Main Design | Base Layout        | Merged Design
2 | Version 1   | Added Button       | Base Layout + Button + Color Change
3 | Version 2   | Changed Color      |

The merged design in cell C2 shows the combined result of the base layout plus the changes from both branches.

Sheet Trace Quiz - 3 Questions

What is the first step in merging the design branches?

A Start with the base layout

B Add the button

C Change the color

D Create a new branch

Key Result

Merged Design combines base layout with changes from multiple branches step by step.

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