Figma Support Forum

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

I’m trying to merge changes back from a branch and I’m being prompted to resolve conflicts first. However when I hit “Resolve conflicts”, the dialog just closes and nothing happens. If I try again, I get the same screen with the same message so I’m unable to merge anything. Is this a known issue?

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!