Skip to content

Commit 5295dbd

Browse files
committed
Added visuals
1 parent 1c0a6ef commit 5295dbd

File tree

4 files changed

+30
-1
lines changed

4 files changed

+30
-1
lines changed

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

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,33 @@ When performing a Git merge in FlutterFlow, you’ll see a screen with multiple
294294
- **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:
295295
- **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:
296296
- **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
301+
height: 0,
302+
width: '100%'}}>
303+
<iframe
304+
src="https://demo.arcade.software/nMguF4fBc0xk27yLd1rw?embed&show_copy_link=true"
305+
title=""
306+
style={{
307+
position: 'absolute',
308+
top: 0,
309+
left: 0,
310+
width: '100%',
311+
height: '100%',
312+
colorScheme: 'light'
313+
}}
314+
frameborder="0"
315+
loading="lazy"
316+
webkitAllowFullScreen
317+
mozAllowFullScreen
318+
allowFullScreen
319+
allow="clipboard-write">
320+
</iframe>
321+
</div>
322+
<p></p>
323+
297324
- **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.
298325
- **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.
299326
- **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
312339

313340
:::info
314341
- 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+
![change](imgs/change.avif)
315343
- 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+
![conflict](imgs/conflict.avif)
316345
:::
317346

318347
- **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:
453482
height: 0,
454483
width: '100%'}}>
455484
<iframe
456-
src="https://demo.arcade.software/hphsdsKGyT8Vid7c0NxX?embed&show_copy_link=true"
485+
src="https://demo.arcade.software/P5NM88UwmeiZ1PHwcnp6?embed&show_copy_link=true"
457486
title=""
458487
style={{
459488
position: 'absolute',
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)