Skip to content

Commit 214b415

Browse files
committed
Address review comments
1 parent 10fdd49 commit 214b415

File tree

1 file changed

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

1 file changed

+6
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,18 +522,21 @@ YAML files play a key role in managing and resolving conflicts during the merge
522522
Why didn’t all my changes appear after merging two branches?
523523
</summary>
524524
<p>
525-
Merging in FlutterFlow is designed to copy only the differences (diffs) between branches, not to replicate the entire contents of one branch into another. This behavior often leads to confusion, especially if users expect merging to act like a full copy-paste of all data.
525+
In merging, Git copies only the differences (diffs) between branches, not the full content from one branch to another. This behavior often leads to confusion, especially if users expect merging to act like a full copy-paste of all data.
526526
</p>
527527
<p>
528528
Here are a few important things to know:
529529
</p>
530530
<ul>
531531
<li><strong>Merging propagates changes (diffs)</strong>: it does not transfer every element from one branch to another.</li>
532-
<li><strong>No conflicts ≠ no changes</strong>: “No conflicts” doesn’t mean “no changes” and it definitely doesn’t mean the project is error-free. You may still have changes merged, and you should review for project errors to ensure everything merged as expected.</li>
532+
<li><strong>No conflicts ≠ no changes</strong>: “No conflicts” doesn’t mean “no changes” and it definitely doesn’t mean the project is error-free.</li>
533+
<li><strong>Project errors are not bugs</strong>: Project errors let you know that you are making mistakes when merging data. Even if changes are successfully merged, project errors indicate areas you should double-check to ensure everything merged as expected.</li>
533534
<li>If a change was previously accepted or rejected during a merge, it won’t appear as a diff the next time you merge the same branches. That’s expected behavior.</li>
534535
</ul>
535536
<p>
536-
For example, if you merge `Branch B` into `Branch A` and copy over `change C`, but later undo that change on `Branch A`, a future merge from `Branch B` into `Branch A` won’t re-flag `change C`. Git considers it as already merged.
537+
538+
For example, you merge `Branch B` into `Branch A`, and `change C` gets copied over. Later, you decide to undo `change C` directly on `Branch A`. Now, if you merge `Branch B` into `Branch A` again, Git will not re-flag `change C` as a difference. This is because Git considers it already merged and no longer a diff.
539+
537540
</p>
538541
<p>
539542

0 commit comments

Comments
 (0)