Running into "File out of memory" while resolving conflicts

Keeping this thread alive, I have been receiving team reports of this problem and would like to know how to proceed

Same here. I have a branch I’m trying to merge into the main file, and I keep getting this error message. Distributed teams all have the main file bookmarked and this is going to cause issues if they need to remap, lose comment history, etc.

Is there a workaround for getting my branch changes into the main file? Sounds like branches are not safe to use?

This won’t work for every branching situation, but I was just able to get around an 80+ conflict merge that was throwing this memory error. Instead of going through each conflict individually, I hit the “Resolve All” option and picked one branch to use for all the changes. It merged quickly with no memory warnings.

+1 - been running into this issue for months at this point. Might have to resort to saving each version into a new branch. Can’t even merge to main.

I just wanted to say I just ran into this too - I was able to find a way around it by identifying a page that needed to be deleted to get the file in sync with main, but both files were originally at 20-25% of usage, so having this come up during the merge was definitely a surprise.

Is Figma support watching this thread @raquino, and are there any suggestions? We recently upgraded to the organization plan and have run into this issue, and it’s a problem. The files are not even that big. It’s the process of merging that causes a memory spike and, ultimately, this error. Can someone please advise.

+1 to this - Cleaned up the file and reduces the size and nothing…
A few days ago it was saying that there was an update from the main to the branch and was for “optimization” only, no real changes… that’s when it crashed for the first time and then this started happening where I can’t resolve conflicts nor merge the branch

This is exactly what happened to me - stuck in branch limbo unable to merge. I think main and feature branch were both smaller than 1GB. I can’t recall exactly how I resolved this (after backing up both files, and reverting back to earlier versions, I think I was able to get changes back into main with some manual updates)

After that ordeal (which came at end of sprint) I ended up breaking up my main file into separate files, and no longer use branching. It was a pain because we had to re-link lots of tickets from the old monolithic file to the new files, devs and other stakeholders needed to remap bookmarks, and had to keep the old file around with instructions on where to find the latest up to date designs. It was not a great look for me, our design team, or Figma as a tool.

I’m running into this several times too…any solutions yet? I haven’t found a pattern for when it happens and when it doesn’t.