Skip to main content

Hi. How are you?


When I was trying to merge a branch, I ended up in this weird state where the merging modal was saying that I had “no conflicts” to resolve AND that I should “resolve conflicts before merging”, at the same time. The button to merge was disabled, and there were no actions I could do in the changes as well. The only way out I had, to not lose the changes in my branch (that had some variables as well), was to duplicate as a new file and delete the older one.


To make things worse, this has happened again, twice in the last couple of weeks.


My question is: Is this some known bug? Is there any clue on what I might be doing wrong to end up in this state?


Thanks a lot,

weird state

Hey @Raphael_Aleixo_Avellar , thanks for flagging it! We are not aware of this issue, if it happens again can you please reach out directly to the support team by filling this form: https://help.figma.com/hc/en-us/requests/new


Be sure to use your Figma account email, include a link to the file (branches you tried to merge), and share then with support-share@figma.com as an Editor, so we can take a closer look. Thank you!

+1 - I have exactly the same problem

Screenshot 2024-08-02 at 11.29.04

Hey @Michael_Williams1 , thanks for flagging this too! Please also reach out directly to the support team: here This will help us to investigate it further the issue on your end. Thank you!

I have this exact same issue. Kinda annoying.

restarting Figma did the trick for me

I have the same issue. Its reared its head a few times in our environment.

Reply


Terms & ConditionsCookie settings