Issues merging branches

Troubleshooting

Hello, I am quite new to flutterflow so apologies if it's something silly.

Im trying to pull changes from our main branch into the branch I work in.

I had one conflict to resolve which was in the navbar. Everything was fine in that regard

The issue is I've lost my custom function

Before the merge:

After the merge:

One change wasn't moved from main into my branch

Main:

My branch:

It's easy to correct these hiccups. My concern is when the application grows and these things go unnoticed. Is there something I've done incorrectly? Do I contact support?

Any help would be greatly appreciated

What have you tried so far?

I've tried going back to the save I made before merging branches, refreshing and trying again. I'm not too sure what else to do unfortunately.

Did you check FlutterFlow's Documentation for this topic?
No
2
5 replies