Merge Failure: Infinite Loading and "Failed to save project for merge" error between branches #6869
Description
Can we access your project?
- I give permission for members of the FlutterFlow team to access and test my project for the sole purpose of investigating this issue.
Current Behavior
When attempting to merge a feature branch (titled "V2") into the main branch, the process fails immediately with a popup error: "Failed to save project for merge." Following this error, the editor enters an infinite loading state (spinning icon) and never progresses to the merge resolution screen where YAML diffs or conflicts would normally be displayed. The UI becomes unresponsive, requiring a hard refresh to regain access to the project.
Expected Behavior
The project should successfully generate the YAML representation of the differences, allow the user to resolve any conflicts in the merge dialog, and save the merged state to the target branch.
Steps to Reproduce
Open project Lockin v1.
Switch to branch V2 (the branch containing the majority of new changes).
Select the option to merge V2 into main.
Observe the "Failed to save project for merge" error popup.
Observe the infinite loading spinner that prevents access to the merge resolution UI.
Reproducible from Blank
- The steps to reproduce above start from a blank project.
Bug Report Code (Required)
NA
Visual documentation
Screen.Recording.2026-01-27.at.02.06.39.mov
Environment
- FlutterFlow version: Latest
- Platform: Flutterflow Desktop App
- Browser name and version: Flutterflow Desktop App
- Operating system and version affected: MacOSAdditional Information
I literally cant do my work bro. All the changes ive made to the feature branch are basically unusable and I'm at a major roadblock waisting tons of time.