Skip to content

Commit 4aea718

Browse files
authored
Apply suggestions from code review
1 parent 92a067b commit 4aea718

File tree

1 file changed

+4
-4
lines changed
  • docs/testing-deployment-publishing/branching-collaboration

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@ FlutterFlow currently supports **two merging approaches**: the existing “**Mer
193193

194194
:::warning
195195

196-
At present, both methods are available side by side, allowing you to either continue using the legacy merge or adopt Git Merge. Over time, as Git Merge proves its stability, the legacy merge may be deprecated.
196+
At present, both methods are available side by side, allowing you to either continue using the legacy merge or adopt Git Merge. Over time, as Git Merge proves its stability, the Legacy Merge option may be deprecated.
197197

198-
The Merge (Legacy) option has some known issues with merges being incorrectly calculated. Therefore, **we strongly recommend using [Git Merge](#git-merge-new) whenever possible for a smoother and more accurate merge process.**
198+
The Merge (Legacy) option has some known issues with merges being incorrectly calculated. Therefore, we **strongly recommend using [Git Merge](#git-merge-new)** whenever possible for a smoother and more accurate merge process.
199199

200200
:::
201201

@@ -237,9 +237,9 @@ Next, you'll see a screen that will display if there are any conflicts. If you d
237237

238238
#### Git Merge (New)
239239

240-
The new Git Merge option uses Git under the hood to calculate differences between project files. Each project is backed by a repository of YAML files (except for custom code, which appears as Dart files). These YAML files map directly to various project properties, and Git calculates differences among these files to identify merge conflicts. This method provides clearer and more consistent conflict detection compared to [legacy Merge](#merge-legacy) (a custom solution).
240+
The new Git Merge option uses Git under the hood to calculate differences between project files. Each project is backed by a repository of YAML files (except for custom code, which appears as Dart files). These YAML files map directly to various project properties, and Git calculates differences among these files to identify merge conflicts. This method provides clearer and more consistent conflict detection compared to [Merge (legacy)](#merge-legacy) (a custom solution).
241241

242-
:::info
242+
:::info[Future Plans]
243243

244244
This option is currently in **Beta**. In addition to fixing any issues, here’s what we have planned:
245245

0 commit comments

Comments
 (0)