Add FAQ for Merging Behavior #344
Conversation
|
|
| </summary> | ||
| <p> | ||
| 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. |
There was a problem hiding this comment.
Please do not phrase it as "Merging in FlutterFlow is designed" -- this is how GIT works, with or without Flutterflow
| </ul> | ||
| <p> | ||
| 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. |
There was a problem hiding this comment.
This is a very long sentence with lots of commas. Hard to read.
Let's split it up into sentences, or even bullets.
There was a problem hiding this comment.
ya, got it. splited it into sentences.
|
@victoriahuang1 comments address. You can review it again. |
| </summary> | ||
| <p> | ||
| 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. |
There was a problem hiding this comment.
This phrasing is misleading -- I think it would be useful to include a diagram to show a full picture of what actually happens.
When a merge (A -> B) occurs, we compare:
- latest state of branch A vs common ancestor between A and B
- latest state of branch B vs common ancestor between A and B
Both of those diffs are then applied to the common ancestor. Conflicts arise if the diffs conflict with each other.
There was a problem hiding this comment.
+1 diagram may be needed!
There was a problem hiding this comment.
@victoriahuang1 updated the info as mentioned and added a diagram. Let me know if it looks good to you now!
| - What changed in `Branch B` since the common starting point. | ||
|
|
||
| If both of you changed different parts, Git can merge them easily. But if you both changed the same part in different ways, Git won’t know which one to keep—that's called a conflict, and you'll need to resolve it manually. |
| <p> | ||
|
|
||
| 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. |
There was a problem hiding this comment.
specify that C was present on B
Description
Add FAQ for merging behavior
Linear ticket and magic word Fixes DEVR-908
Type of change