Merge pull request #246 from FlutterFlow/feature/merge-v2

Merge v2
FlutterFlow · Jan 22, 2025 · c451424 · c451424
2 parents 4fb23c0 + 59a3115
commit c451424
Show file tree

Hide file tree

Showing 10 changed files with 227 additions and 5 deletions.
diff --git a/docs/testing-deployment-publishing/branching-collaboration/branching.md b/docs/testing-deployment-publishing/branching-collaboration/branching.md
diff --git a/...esting-deployment-publishing/branching-collaboration/imgs/accept-all-from-one-branch.avif b/...esting-deployment-publishing/branching-collaboration/imgs/accept-all-from-one-branch.avif
diff --git a/...-deployment-publishing/branching-collaboration/imgs/accept-specific-change-from-file.avif b/...-deployment-publishing/branching-collaboration/imgs/accept-specific-change-from-file.avif
diff --git a/docs/testing-deployment-publishing/branching-collaboration/imgs/bulk-accept.avif b/docs/testing-deployment-publishing/branching-collaboration/imgs/bulk-accept.avif
diff --git a/docs/testing-deployment-publishing/branching-collaboration/imgs/change.avif b/docs/testing-deployment-publishing/branching-collaboration/imgs/change.avif
diff --git a/docs/testing-deployment-publishing/branching-collaboration/imgs/child-parent.avif b/docs/testing-deployment-publishing/branching-collaboration/imgs/child-parent.avif
diff --git a/docs/testing-deployment-publishing/branching-collaboration/imgs/conflict.avif b/docs/testing-deployment-publishing/branching-collaboration/imgs/conflict.avif
diff --git a/docs/testing-deployment-publishing/branching-collaboration/imgs/merging-window.avif b/docs/testing-deployment-publishing/branching-collaboration/imgs/merging-window.avif
diff --git a/docs/testing-deployment-publishing/branching-collaboration/imgs/parent-child.avif b/docs/testing-deployment-publishing/branching-collaboration/imgs/parent-child.avif
diff --git a/docs/testing-deployment-publishing/branching-collaboration/imgs/yaml-validation-error.avif b/docs/testing-deployment-publishing/branching-collaboration/imgs/yaml-validation-error.avif