diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2025-07-08 15:07:18 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2025-07-08 15:25:14 +0200 |
| commit | 5d68428a0058649f07c9be3053bd58fd3462d6d9 (patch) | |
| tree | d411546fba10c3f661978d96cf03211a92406296 /fluid/documentation/src | |
| parent | 3cf5a302fd2225b8d2622eb40e91262f4e7557c1 (diff) | |
Fix trailing whitespace and convert a few tabs to spaces
... according to CMP
Diffstat (limited to 'fluid/documentation/src')
| -rw-r--r-- | fluid/documentation/src/page_mergeback.dox | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fluid/documentation/src/page_mergeback.dox b/fluid/documentation/src/page_mergeback.dox index cbea8add9..7b3bc1a22 100644 --- a/fluid/documentation/src/page_mergeback.dox +++ b/fluid/documentation/src/page_mergeback.dox @@ -6,9 +6,9 @@ # Introduction to Mergeback # - Fluid has introduced an experimental feature called **MergeBack** in version 1.5. - This feature allows developers to edit the C++ source files generated by Fluid and - then merge those changes back into the corresponding Fluid project file (.fl). This + Fluid has introduced an experimental feature called **MergeBack** in version 1.5. + This feature allows developers to edit the C++ source files generated by Fluid and + then merge those changes back into the corresponding Fluid project file (.fl). This can streamline the development process by reducing the need to switch between Fluid and your code editor for minor adjustments. @@ -25,9 +25,9 @@ - Navigate to the **Settings Panel**. - In the **Project Settings**, locate and enable the **MergeBack** option. - Once enabled, Fluid assigns a unique ID to each node in your project. - Additionally, user-editable code sections in the generated source files will - be marked with special divider lines, indicating areas that can be edited + Once enabled, Fluid assigns a unique ID to each node in your project. + Additionally, user-editable code sections in the generated source files will + be marked with special divider lines, indicating areas that can be edited and later merged back. <H2>Understanding the Code Markers:</H2> @@ -43,10 +43,10 @@ } ``` - The lines beginning with `//fl ▼` and `//fl ▲` are markers that Fluid - uses to identify editable sections. These markers contain encoded information - about the code block, including a CRC32 checksum and a unique node ID. Fluid - uses this information during the merge process to detect changes and associate + The lines beginning with `//fl ▼` and `//fl ▲` are markers that Fluid + uses to identify editable sections. These markers contain encoded information + about the code block, including a CRC32 checksum and a unique node ID. Fluid + uses this information during the merge process to detect changes and associate them with the correct nodes in your project. <H2>Editing and Merging Back</H2> @@ -76,5 +76,5 @@ Given the experimental nature of MergeBack, unexpected behaviors may occur. Always ensure you have backups of your project - files before using this feature. + files before using this feature. */ |