Skip to content

Commit 05fd5ce

Browse files
committed
Added visuals
1 parent 5295dbd commit 05fd5ce

File tree

5 files changed

+5
-1
lines changed

5 files changed

+5
-1
lines changed

docs/testing-deployment-publishing/branching-collaboration/branching.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,11 @@ When performing a Git merge in FlutterFlow, you’ll see a screen with multiple
289289

290290
- **Branch Information**: At the top of the merge interface, you’ll see exactly which branches are being merged. You have two options for merging directions:
291291
- **Parent → Child**: Pulls changes down from the parent into the child branch, often used to keep a feature branch in sync with the parent branch.
292+
![parent-child](imgs/parent-child.avif)
292293
- **Child → Parent**: Pushes features (or other changes) from the child branch back up to the parent, commonly done once a feature is ready to go into the parent branch.
293-
- **YAML Validation Errors**: Occurs when manual edits to the project files produce invalid syntax. Clicking on these errors should redirect you to the specific file. Invalid lines will be underlined in red within the file, and, you **cannot** complete the merge while YAML errors exist.
294+
![child-parent](imgs/child-parent.avif)
295+
- **YAML Validation Errors**: These occur when the resulting data is not in a “FlutterFlow-friendly” format—whether that’s due to manual edits or merges that generate incompatible YAML. For example, imagine you have two pages in your project, and each branch independently deletes a different one. After merging, there are zero pages left. Even though no lines of code are edited or directly have a conflict, this results in a YAML Validation Error. Clicking on these errors should redirect you to the specific file. Invalid lines will be underlined in red within the file, and, you cannot complete the merge while YAML errors exist.
296+
![yaml-validation-error](imgs/yaml-validation-error.avif)
294297
- **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:
295298
- **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:
296299
- **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.
@@ -326,6 +329,7 @@ When performing a Git merge in FlutterFlow, you’ll see a screen with multiple
326329
- **Cancel**: Abandons the merge process and discards any conflict resolutions you’ve already applied during this merge session.
327330
- **Merge**: Finalizes the merge once all merge conflicts and YAML validation errors are cleared. Project errors can remain if you choose to resolve them later.
328331
- **Bulk Accept Changes**: Accessible via the **arrow** next to **Merge** button. This option lets you accept all changes from one branch at once—handy if you already know which branch’s changes take precedence.
332+
![bulk-accept](imgs/bulk-accept.avif)
329333

330334
**Left Panel**
331335

Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)