Same problem here!

I’m having the same problem, and it’s happening more often now. Quitting and restarting Figma used to work, but it’s not this time.

Ditto – same problem, and it’s happening more often to us too

Does this problem still persist? My branch is ready to merge, conflicts resolved, but after loading bounces me back to main branch… both browser and app. Reopening does not help. Reboot maybe…

For what it’s worth, I talked with support and did not came up with any special solution for now. They know about the issue, and I hope they can fix it soon.

In the meantime, I decided to merge the branch by hand (Copy/paste changes and new screens to main file and archived the branch). We could do it, as it was pretty simple branch, and I did not stumbled on the issue again so far.

Thank you i dziekuje Mateuszu. Sonia

Having the same issue. Pretty frustrating to see a bug at this level considering with how fundamental expecting to see changes from a branch into the master is for this feature.

Having an issue with updating a branch from the main file. The modal appears and any attempt to click on the button ‘Keep main’ continues to ‘do nothing’. As if the button itself has become disabled. I’ve tried 5x and it will not update. Halp.

And… In 2025 this problem is still exist

Same. Working in branches in Figma for a small change to a substantial library and trying to merge .. taking forever, then failing

I also just stumbled across this.

I resolved all merging conflicts, now Figma is stuck on “Saving file” when trying to close it, it prevents me with this dialogue: “Hang tight! Still merging...” I can only confirm this. It’s been stuck over an hour now, for not that many changes in a rather small file.

Luckily no one else worked on the main branch and I can just try to force quit and then manually copy and paste my changes into the main branch. 

Will probably have to do this after lunch.