Branch reports uninspectable UNCOMMITTED_CHANGES and blocks merge preview

[alkandari1984]

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

Project: LegalFlow
Project ID: legalflow-ydzeec
Branch: staging-test-build

FlutterFlow blocks Parent → Child merge preview and shows:

“Please commit or discard uncommitted changes on branch staging-test-build.”

However:

• FlutterFlow/Codex reports Dirty=false.
• No local uncommitted files or merge workspace exist.
• The Create Commit dialog does not show any diff or list of pending changes.
• No merge has been committed.
• The branch has already passed QA.
• The unknown state prevents us from safely propagating a Development Environment from the parent branch.

Because the pending changes are not visible, I cannot safely Commit or Discard them without risking validated project work.

Expected Behavior

FlutterFlow should either:

1. Show the exact pending/uncommitted changes on staging-test-build so they can be reviewed and safely committed or discarded, or
2. Allow the Parent → Child merge preview when the branch has no actual pending changes.

A validated branch must not be blocked by an invisible server-side UNCOMMITTED_CHANGES state.

Steps to Reproduce

1. Open project LegalFlow (Project ID: legalflow-ydzeec).
2. Switch to branch staging-test-build.
3. Open Version Control.
4. Open Branching Options.
5. Select "Merge sprint-1-development into staging-test-build".
6. FlutterFlow displays:
   "Please commit or discard uncommitted changes on branch staging-test-build."
7. Cancel the merge.
8. Open Version Control → Create Commit.
9. Observe that the Create Commit dialog shows no diff or list of pending changes.
10. External project validation reports the branch as Dirty=false.
11. Retry the merge preview.
12. The same UNCOMMITTED_CHANGES blocker appears.

Reproducible from Blank

• The steps to reproduce above start from a blank project.

Bug Report Code (Required)

IT40ucncw7hIs+FC4LvQXvp4ghcsJWY9XeY4mN57aCosfZT2BLMcec/RVERVOcTid2w6e2GJ+GoW0+D7k/OTFfQqGzidUYRg/6t6Zw2UVluieLqsFJWgeXElAppQFW663KWjvR1CH/ttLUICwHGUIvOsaC7UNIzSC0dNDq/LZO4=

Visual documentation

Attached screenshots show:

1. The staging-test-build branch history with existing committed and validated changes.
2. The Create Commit dialog showing no visible diff or pending change list.
3. The merge blocker stating that staging-test-build has uncommitted changes.

These three views together show an inconsistent server-side branch state: the branch is validated and commit history is present, but FlutterFlow blocks merge preview while exposing no inspectable pending changes.

Environment

-- FlutterFlow version: 7.0.71
- Platform: Web
- Browser name and version: Google Chrome (current)
- Operating system and version affected: macOS FlutterFlow version: 
- Platform:
- Browser name and version:
- Operating system and version affected:

Additional Information

This blocks our validated staging workflow.

We need to propagate a newly created Development Environment through the branch hierarchy, but FlutterFlow will not allow even a merge preview while it reports unknown uncommitted changes.

The staging-test-build branch is validated and currently reports QA=PASS and Dirty=false through our project tooling.

We cannot safely Commit or Discard an unknown server-side state because doing so could alter or destroy validated project work.

Please inspect the server-side branch working state and either expose the exact pending diff or clear the stale state without modifying validated branch content.

[Juansarmi]

Hello! 👋

For this type of issue, please reach out to our Support team through the in-app chat or by emailing support@flutterflow.io.

Best regards.