Merge v2 #246
Merge v2 #246
Conversation
|
|
docs/testing-deployment-publishing/branching-collaboration/branching.md
Outdated
Show resolved
Hide resolved
docs/testing-deployment-publishing/branching-collaboration/branching.md
Outdated
Show resolved
Hide resolved
docs/testing-deployment-publishing/branching-collaboration/branching.md
Outdated
Show resolved
Hide resolved
docs/testing-deployment-publishing/branching-collaboration/branching.md
Outdated
Show resolved
Hide resolved
|
|
||
| - **Filter Files:** You can use filters to narrow down the list of YAML files based on specific criteria: | ||
|
|
||
| - **All Files (Unchanged Files)**: Shows every YAML file in the project. |
There was a problem hiding this comment.
not every file -- just the ones without changes
| height: 0, | ||
| width: '100%'}}> | ||
| <iframe | ||
| src="https://demo.arcade.software/hphsdsKGyT8Vid7c0NxX?embed&show_copy_link=true" |
There was a problem hiding this comment.
This was recorded from an outdated UI. Please take a look at the new one.
| - **Branch Information**: At the top of the merge interface, you’ll see exactly which branches are being merged. You have two options for merging directions: | ||
| - **Parent → Child**: Pulls changes down from the parent into the child branch, often used to keep a feature branch in sync with the parent branch. | ||
| - **Child → Parent**: Pushes features (or other changes) from the child branch back up to the parent, commonly done once a feature is ready to go into the parent branch. | ||
| - **YAML Validation Errors**: Occurs when manual edits to the project files produce invalid syntax. Clicking on these errors should redirect you to the specific file. Invalid lines will be underlined in red within the file, and, you **cannot** complete the merge while YAML errors exist. |
There was a problem hiding this comment.
Occurs when manual edits to the project files produce invalid syntax.
This is incorrect. Even without any manual intervention, validation errors can occur. This simply means that the resulting data is not in a "Flutterflow-friendly" format
There was a problem hiding this comment.
Hi @victoriahuang1 I didn't understand this fully. Could you please elaborate with an example?
There was a problem hiding this comment.
For example, if there are a total of 2 pages, and each branch deletes a different one, then there would be no pages left. There are no conflicts, but the fact that there are 0 pages causes validation errors
There was a problem hiding this comment.
Ok Updated! Thanks.
Description
Merge V2
Linear ticket and magic word Fixes DEVR-732
Type of change