Branching and merging in Figma - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the code to create a new branch in Figma.

Figma

figma.[1]('new-feature')

Drag options to blanks, or click blank then click option'

Amerge

Bpush

Cbranch

Dcommit

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'merge' instead of 'branch' to create a new branch.

Confusing 'commit' with branching.

In Figma, branch is used to create a new branch for parallel work.

2fill in blank

medium

Complete the code to merge a branch named 'feature' into the main branch.

Figma

figma.merge('[1]', 'main')

Drag options to blanks, or click blank then click option'

Afeature

Btest

Cdevelop

Drelease

Attempts:

3 left

💡 Hint

Common Mistakes

Merging from the wrong branch like 'develop' or 'test'.

Confusing the target and source branches.

To merge changes from the feature branch into main, specify 'feature' as the source branch.

3fill in blank

hard

Fix the error in the code to correctly merge the 'bugfix' branch into 'main'.

Figma

figma.[1]('main', 'bugfix')

Drag options to blanks, or click blank then click option'

Acommit

Bmerge

Cbranch

Dpush

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'branch' or 'commit' instead of 'merge'.

Swapping the order of branches in the merge call.

The merge function takes the source branch first, then the target branch. The correct order is merge('bugfix', 'main').

4fill in blank

hard

Fill both blanks to create a branch named 'experiment' and then merge it into 'main'.

Figma

figma.[1]('experiment')
figma.[2]('experiment', 'main')

Drag options to blanks, or click blank then click option'

Abranch

Bcommit

Cmerge

Dpush

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'commit' instead of 'branch' to create a branch.

Using 'push' instead of 'merge' to combine branches.

First, create a branch with branch('experiment'). Then merge it into main with merge('experiment', 'main').

5fill in blank

hard

Fill all three blanks to create a branch 'test', commit changes, and merge into 'main'.

Figma

figma.[1]('test')
figma.[2]('Added new UI elements')
figma.[3]('test', 'main')

Drag options to blanks, or click blank then click option'

Abranch

Bcommit

Cmerge

Dpush

Attempts:

3 left

💡 Hint

Common Mistakes

Skipping the commit step.

Using 'push' instead of 'merge' to combine branches.

Mixing up the order of operations.

First, create the branch with branch('test'). Then commit your changes with commit('Added new UI elements'). Finally, merge the branch into main with merge('test', 'main').

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