Resolve conflicts doesn't do anything, can't merge

Hi James,

Sorry for the inconvenience! This may be related to a known issue—are you working on a branch which has been restored since a merge into main? If so, we are looking into the issue, and must recommend that you work on a new branch.

If not, I will follow up with you privately to learn more! Thanks for holding tight!

Has this issue solved yet? I’m struggling same issue now.

Hi! Is it resolve? I’ve the same issue now, thank you!

Same issue here, pressed resolve and am taken to library without my changes and then it applies them 30-1m later but has no conflicts. After I did this once the number of conflicts actually went up from 1 to 2.

My original issue seemed to resolve itself after being stuck for a 3-4 weeks, but I didn’t do anything in particular to fix it. Not sure what happened!

I have a similar issue when trying to resolve conflicts. The progress bar gets to the end and then just sits there. I have to restart Figma to get out of it.

I have this kind of issue too. Despite several update of Figma. Each time the update couldn’t be done because of a conflict I couldn’t resolve. When I tried to update the branch from master or resolve the conflict I got a grey full screen. Sounded like a great old windows blue screen 😃

The same problem as Jean, there is a console error:

Now I’m also having this problem. Just need to fix 1 conflict before I can merge but the dialog box keeps crashing!

Were you able to find a solution for this? I’m getting no response from @Figma_Support

Hi Alex - having real difficulty with this exact same problem currently i.e. want to merge a branch but I have a conflict - when trying to resolve the conflict, Figma crashes… please help 🙏

Having same issue. It has been over a year since first reported here. When will this bug be fixed?

Get a similar issue still. Hit Resolve, displayed a list of frames that differ with no option to do anything about it.