Skip to content

Commit ead8bb8

Browse files
committed
Added visuals
1 parent 379539e commit ead8bb8

File tree

2 files changed

+31
-2
lines changed

2 files changed

+31
-2
lines changed

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

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,34 @@ This option is currently in **beta**. In addition to fixing any issues, here’s
252252

253253
:::
254254

255-
[how to initiate merge with this option; just like previous one]
255+
To initiate a Git Merge, navigate to **Toolbar >** select **Branching > Branching options >** select **Git Merge**.
256+
257+
<div style={{
258+
position: 'relative',
259+
paddingBottom: 'calc(56.67989417989418% + 41px)', // Keeps the aspect ratio and additional padding
260+
height: 0,
261+
width: '100%'}}>
262+
<iframe
263+
src="https://demo.arcade.software/8RY2cm1vYI5waxHLGImY?embed&show_copy_link=true"
264+
title=""
265+
style={{
266+
position: 'absolute',
267+
top: 0,
268+
left: 0,
269+
width: '100%',
270+
height: '100%',
271+
colorScheme: 'light'
272+
}}
273+
frameborder="0"
274+
loading="lazy"
275+
webkitAllowFullScreen
276+
mozAllowFullScreen
277+
allowFullScreen
278+
allow="clipboard-write">
279+
</iframe>
280+
</div>
281+
<p></p>
282+
256283

257284
When performing a Git merge in FlutterFlow, you’ll see a screen with multiple panels and info sections. Here are the details of it.
258285

@@ -318,6 +345,8 @@ Git attempts to combine changes from both branches automatically. If Git can’t
318345
- `=======`: Separates your current branch’s changes from the other branch’s changes.
319346
- `>>>>>>> <other-branch>`: Marks the end of the conflict, indicating the other branch’s changes.
320347

348+
You might decide to keep certain lines from `HEAD` (your current branch) or from the other branch or combine them manually.
349+
321350
:::info
322351

323352
During merge conflict, Git may label branches as `HEAD` or a commit reference, which can differ from the friendly branch names you given.
@@ -327,7 +356,7 @@ During merge conflict, Git may label branches as `HEAD` or a commit reference, w
327356

328357
:::
329358

330-
You can modify files in the lower panel at any time—even if there’s no conflict. You could also choose which branch’s changes to keep here. You might decide to keep certain lines from `HEAD` (your current branch) or from the other branch or combine them manually.
359+
You can modify files or edit the project directly from the lower panel at any time—even if there’s no conflict.
331360

332361
After editing, click **Save Changes** to confirm your changes. A red reset button appears if you want to undo your edits and restore the file to its initial state before you began editing.
333362

0 commit comments

Comments
 (0)