Skip to main content
James_Pai
James_Pai
June 15, 2021
Question

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

  • June 15, 2021
  • 13 replies
  • 2104 views

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?

Screen Shot 2021-06-14 at 5.38.05 PM

This topic has been closed for replies.

13 replies

Show previous replies
Alex_Thurman
Alex_Thurman
July 5, 2022

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 🙏

Cantrelle_Bobby
Cantrelle_Bobby
New Member
September 22, 2022

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

    warface
    warface
    November 7, 2024

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

      Terms & ConditionsAccessibility statement