Auto-Merging Files With External Commits
Other authors can work in the same file as you using an external source, such as Flare Desktop. Since Flare Online uses collaborative real-time technology it does not lose track of external changes or create conflicts, but rather invokes an auto-merging process where you are always guaranteed a valid document.
For example, you are working on a file, and someone else edits the same file in an external source and "pushes" the change to Flare Online. When you commit your changes to the file, Flare Online detects external commits and starts the auto-merge process. You can choose to review the external commits, or proceed to commit merged changes.
Note The version history and your working copy of the file in the Content Editor do not display external commits merged until you attempt to commit the file (even though behind-the-scenes external commits exist in the repository).
Note Flare Online is a Git-based system, where files are version controlled and tracked using the system's source control. The system implements "rules" for resolving possible conflicts. The platform allows for secure co-authoring from anywhere with any device, and accessibility to your online files from the Git repository with no memory or performance impacts.
Example The following is an example of how a common auto-merging workflow might play out. A project is bound between Flare Online and Flare Desktop, and two authors are editing the same file, on the same branch, in the same project.
User 1 Open a file in Flare Online's Content Editor.
User 2 Open the same file, but in an external source (e.g., Flare Desktop).
User 2 Edit the file by changing the content.
User 1 Edit the same file by changing the content.
User 2 Commit and push changes in Flare Desktop to the remote repository (i.e., Flare Online). See the Flare Desktop Help.
User 1 Commit the same file in Flare Online's editor. Clicking the Commit button starts the auto-merge process. Upon the initial commit, the outside edits (or external commits) display in the workspace.
User 1 Cancel to review the external commits in the workspace, or proceed to commit merged changes.
