Merging the Main into Dev branch doesnt work as a Pull. Data is lost afterwards when trying to merge Dev into Main

[FrancoSernaglia]

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

I was developing in the Development branch when I needed to bring some configuration changes from the main branch. I did so and merged the main into my branch. Now, after some weeks I decided to merge the development branch into the main one. Nevertheless, most changes done in development are considered as deleted in the main branch so no merge of the new features is being made.

Expected Behavior

When bringing the main branch to development I just want to bring the changes made and not to consider the new changes in development as deleted changes.

Steps to Reproduce

1. Create a development branch
2. Make changes in the dev branch
3. Merge the main branch in the dev branch
4. Merge the dev branch into the main
5. See how the changes done in dev are getting deleted

Reproducible from Blank

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

Bug Report Code (Required)

IT40lubfuMp/nNdy57j9LfRUqDoRQ0x9Xbgzt+xBaDUsIuOtBuwtP8/CYRFVUtCoaVNcGFX9kkI00fONueLhCMFdMgSdQKo4wqpQZjr0e2iVbJCIO8y0OXNSEdtjIGrD0bW3myJ7IrBsWXw76k+HN/OWbDDDIuu/Zwh9f6PHaOI=

Visual documentation

Here you can see that the new feaure of the development branch is considered as deleted in the main. It is very weird because it never existed in the main branch before. The same happens to all changes done in development, they are not being merged.

Environment

- FlutterFlow version: v5.4.4
- Platform: Desktop app Windows
- Browser name and version: 
- Operating system and version affected: Windows 11, Intel i3

Additional Information

Its critical as I cant use the main branch anymore because of this. I would love to just overwrite the main branch with the development one.

[Alezanello]

Hello!

Thanks for your patience. I’m not yet able to trigger the issue you mentioned. Let me share the exact steps I followed, and I’ll also attach a full video so you can check if I missed anything based on your description:

1. Created a new project
2. Added a Row with two Buttons
3. Committed changes to the Main branch
4. Created a DevBranch
5. Added a Container with an image inside it
6. Committed changes to the DevBranch
7. Merged DevBranch into Main
8. Went back to DevBranch and merged Main into DevBranch

I was able to complete all these steps without encountering any issues.

Please take a look at the video and let me know if there’s a specific detail or step I might have missed. I’ll be happy to investigate further!

Public project: https://app.flutterflow.io/project/qa-4050-te6hdd

Screen-Recording (23).mp4

[FrancoSernaglia]

Hi Alezanello, thanks for your response. The 7th step is the other way around.

Try this after step 6:

7_ Make any change to the main
8_ Merge the main into dev
9_ Make any change to the dev branch
10_ Merge dev into main.
11_ See how the step 9 changes are getting deleted.

I am trying to reproduce it but I am encoutering other FlutterFlow problems like infinite loading when merging

[FrancoSernaglia]

Well I did followed the steps and couldn't reproduce the issue

Here the changes in dev branch (step 9) are being merged correctly:

(contrary to my photo in the issue description where the new changes are getting deleted)

I really dont know why in my project the changes in dev branch are getting deleted in the main one. Is there any way to restablish the YAML files? Is it possible Alezanello for you to merge dev into main in my CityPooling project and see how PedidoDatos is being deleted? And see that actually PedidoDatos doesn't exist in the main branch before?