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
When performing a Git merge in FlutterFlow, you’ll see a screen with multiple panels and info sections. Here are the details of it.
258
285
@@ -318,6 +345,8 @@ Git attempts to combine changes from both branches automatically. If Git can’t
318
345
-`=======`: Separates your current branch’s changes from the other branch’s changes.
319
346
-`>>>>>>> <other-branch>`: Marks the end of the conflict, indicating the other branch’s changes.
320
347
348
+
You might decide to keep certain lines from `HEAD` (your current branch) or from the other branch or combine them manually.
349
+
321
350
:::info
322
351
323
352
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
327
356
328
357
:::
329
358
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.
331
360
332
361
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.
0 commit comments