Branching and merging in Figma - Dashboard Guide

Dashboard Mode - Branching and merging

Goal

Understand how branching and merging help teams work together on BI dashboard designs without conflicts.

Sample Data: Branches and Changes

Branch Name	Created By	Created Date	Changes Made	Status
main	Alice	2024-06-01	Initial dashboard layout	Active
feature-sales-chart	Bob	2024-06-03	Added sales bar chart	Ready to merge
feature-filter-panel	Carol	2024-06-04	Created filter panel for regions	Ready to merge
bugfix-typo	Dave	2024-06-05	Fixed typo in KPI card	Merged
feature-kpi-cards	Eve	2024-06-06	Added KPI cards for revenue	In progress

Dashboard Components

• Main Branch: Base dashboard layout with placeholders for charts and filters.
• Sales Bar Chart (feature-sales-chart): Bar chart showing monthly sales totals. Formula: Sum of sales by month.
• Filter Panel (feature-filter-panel): Interactive panel to filter data by region. Connected to all charts and tables.
• KPI Cards (feature-kpi-cards): Cards showing total revenue, average sales, and number of customers. Calculated using sum and average formulas.
• Bugfix (bugfix-typo): Corrected text label on KPI card for clarity.

Dashboard Layout

+--------------------------------------------------+
|                   KPI Cards                       |
|  [Total Revenue]  [Avg Sales]  [Customers]       |
+--------------------------------------------------+
|  Filter Panel           |      Sales Bar Chart    |
|  (Region filter)        |      (Monthly sales)    |
+--------------------------------------------------+

Interactivity

The filter panel lets users select regions. When a region is selected, the sales bar chart and KPI cards update to show data only for that region. Branches adding these components merge their changes so the dashboard works smoothly together.

Self Check

If you add a filter for Region = 'East', which components update?

• Sales Bar Chart updates to show sales only for East region.
• KPI Cards update to show revenue, average sales, and customers for East region.
• Main layout and filter panel remain the same.

Key Result

A BI dashboard demonstrating how branching and merging combine sales charts, filters, and KPI cards for collaborative design.

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