You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/testing-deployment-publishing/branching-collaboration/branching.md
+30-1Lines changed: 30 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -294,6 +294,33 @@ When performing a Git merge in FlutterFlow, you’ll see a screen with multiple
294
294
-**Project Errors**: Project errors occur when the result of a merge creates a problem in your project. For example, this might happen if the merge results in two data types having the same name. These errors need to be resolved to ensure your project works as expected. You have several options to deal with project errors:
295
295
-**Fix Errors During the Merge**: This approach ensures that the merged project is error-free right from the start. Here’s how you can do it:
296
296
- **Edit the YAML files:** Update the project YAML files (in the Right Lower Panel) to fix issues, such as renaming a data type that causes a conflict.
297
+
298
+
<div style={{
299
+
position: 'relative',
300
+
paddingBottom: 'calc(56.67989417989418% + 41px)', // Keeps the aspect ratio and additional padding
- **Edit the Project Directly while Merging:** While still in the merge process, open the project, make the necessary changes (like renaming the conflicting data type), and then continue.
298
325
-**Fix Errors After the Merge**: If you prefer, you can complete the merge first and address the errors later. For example, finish the merge process as it is. After merging, go back to the project and resolve any issues.
299
326
-**Cancel**: Abandons the merge process and discards any conflict resolutions you’ve already applied during this merge session.
@@ -312,7 +339,9 @@ The left-hand side panel displays all the project files in YAML format. YAML (Ye
312
339
313
340
:::info
314
341
- A **change** refers to any update, addition, or deletion made in one of the branches. For example, modifying a field name or changing the properties of a widget.
342
+

315
343
- A **conflict** occurs when the same part of a file has been changed in both branches, making it unclear which version to keep. For instance, if one branch changes the color of the Container to blue and the other changes it to red, this creates a conflict.
344
+

316
345
:::
317
346
318
347
-**Search File:** If you’re looking for a particular file, you can use the search bar to locate it quickly. This is especially useful in larger projects with many files.
@@ -453,7 +482,7 @@ You can review each file with merge conflicts and choose to:
0 commit comments