Skip to main content

Hello!


I have created a branch of my design system to introduce the variables feature.

Bug fixes still happened in the main file.


Now I’m done with the variables and I want to merge them.

But when I start to fix the conflicts, Figma gets stuck.

No matter if I open it in the browser or in the standalone app.

Reloading it doesn’t help either.


Figma memory is still green with a maximum of 44%.


Is there any way to automatically settle on “keep main” to bypass the conflict modal?

Maybe there is another solution that will help me.


Many thanks!

Matthias

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)

Reply


Terms & ConditionsCookie settings