Branching - Update from main file Conflicts - Stuck

Hi @Matthias sorry to hear this is happening! Can you reach out to our support team directly via this form for help: https://help.figma.com/hc/en-us/requests/new

Please be sure to include a video of the issue along with the links to the file and branch you are having issues with and share it with support-share@figma.com so they can take a closer look.

same here. whenever i try to resolve conflicts in our component library it gets stuck. i eventually get through it but it’s a tedious, painful thing to do.

i never get to see the preview for both branches, clicking a button takes several minutes until it moves to the next item, i have to trust my knowledge of layer names to select the right version.

what i can do is click the “keep main” button multiple times (if i know exactly how many items i can keep from main branch) - it still takes a few minutes but at least it resolves a few items at once.

it just took me about 30+ minutes to fix 18 conflicts.

horrible experience and i’d really need to use branches but i’m considering moving away from it, cause this happens every time!

(side note: memory usage shows 18% for the file in question)

I’m stuck with the same. I don’t have options to select the desired branch to resolve the conflict.

Figma - 125.0.8

macOS - 15.3

VarunYellina wrote:

I’m stuck with the same. I don’t have options to select the desired branch to resolve the conflict.

 

 

Figma - 125.0.8

macOS - 15.3

Had to restart Figma. The conflicts are no longer there. Vanished magically.