How do you merge a Figma branch and resolve component conflicts?

What's really being asked

This question tests whether you understand Figma's native branching and merging workflow as distinct from engineering version control. Interviewers want to see that you know how library files, component updates, and instance overrides propagate through a branch merge, and that you can resolve conflicts without breaking the design system or downstream screens.

The full answer

First, the candidate should explain that they would open the branch and use the update from main action to pull the latest main file changes into their working branch. Second, they should describe Figma's conflict picker interface, which surfaces component and instance changes side-by-side when the same main component was edited in both branches. Third, they should walk through resolution options: accepting the main version, keeping the branch version, or manually blending changes such as adjusting variant properties, layer names, or auto-layout settings after the merge. Fourth, they should mention validating instances across key screens to ensure overrides survived the merge. Finally, they should close by publishing the library update so the merged component changes propagate to consuming files.

The mistakes people make

A major red flag is describing Git-style command-line merges, pull requests, or diffing tools outside Figma. Another is suggesting you would copy the modified component from one branch and paste it over the other, which destroys instance links and override history. Candidates who say they would simply overwrite main without reviewing instance impact also signal weak design systems hygiene. Ignoring the library publish step is another miss, because unpublished component changes stay local to the file.

What usually comes next

The interviewer might ask how you would handle a conflict if the component has many nested instances or if another designer is actively using the component in a separate file. They might also ask what you would do if the merge breaks auto-layout or variant structures, or how you would communicate the change to the broader team.

A concrete example

Suppose you branched a design system file to add a new icon slot to a button component. While you were working, another designer on main updated that same button to use a new color variable and changed the text layer name. When you update from main, Figma flags the button component in the conflict picker. You would compare the two versions side-by-side, keep the color variable update from main, then manually re-apply your icon slot addition to the updated layer structure. After merging, you would spot-check five instance placements across the product screens to confirm overrides are intact, then publish the library so the updated button flows to all linked files.