Merge branch 'refs/heads/main' into pooja/deeplink

Author: PoojaB26

docs/ff-concepts/adding-customization/custom-code.md

@@ -243,6 +243,22 @@ Here's an example of an Action that returns a _nullable_ integer.
 
 ![return-value-actions.png](imgs/return-value-actions.png)
 
+## Description
+
+You can add a [**Description**](../../intro/ff-ui/resource-hierarchy.md#resource-description) note on Custom Functions and Custom Actions to briefly explain their purpose, usage, or important details. This helps clarify what the function or action is intended for, making your project more understandable and maintainable—especially in libraries and collaborative environments.
+
+![adding-description-on-custom-function-action.avif](imgs/adding-description-on-custom-function-action.avif)
+
+You can view these descriptions as tooltips by hovering over the green note icon when selecting a Custom Function or Custom Action.
+
+![view-description-custom-function-and-custom-action](imgs/view-description-custom-function-and-custom-action.avif)
+
+:::tip
+In the generated code, descriptions are added as comments before the function definition, and they also appear in the custom code editor.
+
+![description-in-custom-code](imgs/description-in-custom-code.avif)
+:::
+
 ## Adding a Pubspec Dependency
 To utilize community-built Flutter solutions in your FlutterFlow projects, you can add a "pubspec dependency". The **pubspec file** is the configuration file in Flutter projects that lists external packages or libraries, along with other project configurations.
 

docs/ff-concepts/adding-customization/imgs/adding-description-on-custom-function-action.avif

@@ -7,14 +7,46 @@ sidebar_position: 5
 keywords: [Loops, Backend Query, Backend Logic, Control Flow, FlutterFlow]
 ---
 
-Sometimes, you might want to trigger certain actions multiple times. For example, an app might fetch data from a server, and you want to handle network errors by retrying the request up to a certain number of times.
+# Loops
 
-:::info
-Every loop requires a condition, and the actions within the loop will continue to trigger as 
-long as the condition holds true. When the condition becomes false, the loop terminates, and the next actions in the workflow will trigger.
-:::
+**Loops** in FlutterFlow allow you to perform repetitive tasks without writing complex code. This is useful when working with lists of data or when you want to repeat actions a certain number of times.
+
+There are two types of loops supported in FlutterFlow:
+
+## While Condition Loops
+
+A **While Condition** loop requires a condition. The actions within the loop will continue to trigger as long as the condition holds true. When the condition becomes false, the loop terminates, and the next actions in the workflow will trigger. 
+
+For example, you can use a While Condition loop to continuously check if a user is still within a geofenced area. As long as the condition `isUserInLocation == true` holds, the app might keep checking for updates or show a live indicator.
 
 ![loop-block.png](img/loop-block.png)
+
+## Over List
+
+This loop type lets you iterate over a list of items to perform actions for each item in the list.
+
+For example, if you have a list of items in a shopping cart and want to calculate the total price or apply a discount to each item, you can use Over List to go through each product and perform a calculation for each one.
+
+You can also customize how the loop iterates:
+
+- **Start Index**: Where the loop starts (default is `0`).
+- **End Index**: Where the loop ends (default is the length of the list).
+- **Step Size**: Interval between each iteration (e.g., set to `2` to loop through every second item).
+- **Reverse Order**: Enables the loop to iterate from the end of the list to the beginning (e.g., showing the latest messages first).
+
+![loop-over-list.avif](img/loop-over-list.avif)
+
+Inside a loop, you can access the current item and its index. This gives you the ability to work with each item individually, such as displaying item-specific data and making calculations.
+
+![access-item-inside-loop.avif](img/access-item-inside-loop.avif)
+
+:::tip[Nested Loops]
+
+You can also add a loop inside another loop to handle related data structures. For example, looping through orders and then looping through each order’s line items.
+
+:::
+
+
 ## Loop Breaks 
 
 :::danger[AVOID an INFINITE LOOP]

docs/ff-concepts/adding-customization/imgs/description-in-custom-code.avif

@@ -188,75 +188,20 @@ During a merge, FlutterFlow compares the changes made in both branches, if the c
 
 :::
 
-### Initiating a Merge
-
-FlutterFlow currently supports **two merging approaches**: the existing “**Merge**” functionality and the new “**Git Merge**” (v2).
-
-- [**Merge (Legacy)**](#merge-legacy): The legacy merge uses a custom tool (originally built in FlutterFlow) to calculate differences and conflicts between branches.
-- [**Git Merge (New)**](#git-merge-new): The new Git Merge option leverages Git's robust repository and conflict-resolution capabilities.
-
-:::warning
-
-At present, both methods are available side by side, allowing you to either continue using the legacy merge or adopt Git Merge. Over time, as Git Merge proves its stability, the Legacy Merge option may be deprecated. 
-
-The Merge (Legacy) option has some known issues with merges being incorrectly calculated. Therefore, we **strongly recommend using [Git Merge](#git-merge-new)** whenever possible for a smoother and more accurate merge process.
-
-:::
-
-#### Merge (Legacy)
-
-You can initiate a merge in either direction—merging from a parent branch into a child branch or from a child branch back into the parent branch—by selecting the **Branch** Options button next to the current branch in the Branching Menu.
-
-<div style={{
-    position: 'relative',
-    paddingBottom: 'calc(56.67989417989418% + 41px)', // Keeps the aspect ratio and additional padding
-    height: 0,
-    width: '100%'
-}}>
-    <iframe 
-        src="https://demo.arcade.software/VHuZbhTfT8Q8GbaMzMWA?embed&show_copy_link=true"
-        title="Initiating a Merge"
-        style={{
-            position: 'absolute',
-            top: 0,
-            left: 0,
-            width: '100%',
-            height: '100%',
-            colorScheme: 'light'
-        }}
-        frameborder="0"
-        loading="lazy"
-        webkitAllowFullScreen
-        mozAllowFullScreen
-        allowFullScreen
-        allow="clipboard-write">
-    </iframe>
-</div>
-<p></p>
-
-
-Next, you'll see a screen that will display if there are any conflicts. If you don’t have any conflicts, you can simply go ahead and click **Merge Branch**.
-
-![merge](../imgs/merge.avif)
-
-#### Git Merge (New)
-
-The new Git Merge option uses Git under the hood to calculate differences between project files. Each project is backed by a repository of YAML files (except for custom code, which appears as Dart files). These YAML files map directly to various project properties, and Git calculates differences among these files to identify merge conflicts. This method provides clearer and more consistent conflict detection compared to [Merge (legacy)](#merge-legacy) (a custom solution).
+Merging in FlutterFlow uses Git under the hood to calculate differences between project files. Each project is backed by a repository of YAML files (except for custom code, which appears as Dart files). These YAML files map directly to various project properties, and Git calculates differences among these files to identify merge conflicts.
 
 :::info[Future Plans]
-
-This option is currently in **Beta**. In addition to fixing any issues, here’s what we have planned:
-
 - **Hover-Based Documentation**: Display helpful tooltips for YAML fields (scheduled before production release).
 - **Inline YAML Errors**: Show errors directly in the file for quicker fixes (scheduled before production release).
 - **Simplified YAML**: Make YAML files and errors more user-friendly and understandable.
 - **Enhanced Visual Diff Tools**: Provide more intuitive views for comparing changes.
 - **User Experience Improvements**: Continuously refine merging workflows and UI elements.
 - **Performance Optimizations**: Improve speed when initiating merges.
-
 :::
 
-To initiate a Git Merge, navigate to **Toolbar >** select **Branching > Branching options >** select **Git Merge**.
+### Initiating a Merge
+
+To initiate the Merge, navigate to **Toolbar >** select **Branching > Branching options >** select **Merge**.
 
 <div style={{
     position: 'relative',
@@ -285,7 +230,7 @@ To initiate a Git Merge, navigate to **Toolbar >** select **Branching > Branchin
 <p></p>
 
 
-When performing a Git merge in FlutterFlow, you’ll see a screen with multiple panels and info sections. Here are the details of it.
+When performing a merge in FlutterFlow, you’ll see a screen with multiple panels and info sections. Here are the details of it.
 
 ![merging-window](imgs/merging-window.avif)
 
@@ -430,79 +375,6 @@ For example, imagine two developers, Alice and Bob, are working on the same Flut
 
 When Alice's changes are merged into the main project first, her updates will be integrated without any issues. However, when Bob tries to merge his changes afterward, a merge conflict will occur because the changes to the button text and color have already been modified by Alice.
 
-In your project, if you get merge conflicts, here’s how you resolve them.
-
-#### Merge (Legacy)
-
-<div style={{
-    position: 'relative',
-    paddingBottom: 'calc(56.67989417989418% + 41px)', // Keeps the aspect ratio and additional padding
-    height: 0,
-    width: '100%'
-}}>
-    <iframe 
-        src="https://demo.arcade.software/Ttcvg8zDKtlQSakqppOf?embed&show_copy_link=true"
-        title="Resolving Merge Conflicts"
-        style={{
-            position: 'absolute',
-            top: 0,
-            left: 0,
-            width: '100%',
-            height: '100%',
-            colorScheme: 'light'
-        }}
-        frameborder="0"
-        loading="lazy"
-        webkitAllowFullScreen
-        mozAllowFullScreen
-        allowFullScreen
-        allow="clipboard-write">
-    </iframe>
-</div>
-<p></p>
-
-For certain conflicts, such as those involving variables and API configurations, you'll see a **View Configuration** option. Enabling this option opens the split screen view displaying changes from the new branch, allowing you to easily identify what has changed.  In this view, you can see things that were removed highlighted in red, and things that were added highlighted in green.
-
-![view-configuration](../imgs/view-configuration.avif)
-
-
-If you choose to resolve manually, you can directly make changes in the **Accepted Changes** section. Note that if you cancel a manual resolution, you can choose to either keep or discard the changes you have made since starting the manual resolution.
-
-<div style={{
-    position: 'relative',
-    paddingBottom: 'calc(56.67989417989418% + 41px)', // Keeps the aspect ratio and additional padding
-    height: 0,
-    width: '100%'
-}}>
-    <iframe 
-        src="https://demo.arcade.software/xZsRHG7d5rfNf5z937hZ?embed&show_copy_link=true"
-        title="Sharing a Project with a User"
-        style={{
-            position: 'absolute',
-            top: 0,
-            left: 0,
-            width: '100%',
-            height: '100%',
-            colorScheme: 'light'
-        }}
-        frameborder="0"
-        loading="lazy"
-        webkitAllowFullScreen
-        mozAllowFullScreen
-        allowFullScreen
-        allow="clipboard-write">
-    </iframe>
-</div>
-<p></p>
-
-:::info
-
-If the visual editor doesn't display something in the split screen UI that you need to manage during a merge, click the **Edit Project** button and edit the project as usual.
-
-::::
-
-
-#### Git Merge (New)
 When you initiate a merge using Git, the system attempts to automatically reconcile your project files. Any conflicts that cannot be automatically resolved are flagged for your attention.
 
 You can review each file with merge conflicts and choose to: