Do I Have to Worry About Conflicts?

One of the biggest benefits of collaborative authoring is that you can avoid conflicts that you might otherwise encounter, at least when authors are editing files in the same branch in Flare Online (see Branching). That's because each author's changes are visible and automatically incorporated when the commit is made. You can collaboratively and concurrently author a file without the worry of losing work or running into conflicts.

Keep in mind, however, that conflicts could still eventually arise later under certain circumstances. For example, you might have made changes to a file in Flare Desktop, and when you do a pull, you might see conflicts with changes made in the same file in Flare Online. Another example is when you use Flare Desktop to merge files from one branch into another; if changes are different in the same file, you might need to resolve conflicts.

See Auto-Merging Files With External Commits.