MadCap Flare Videos
Source Control (10 of 11): Conflicts
This video shows you how to deal with some of the main kinds of source control conflicts that can happen when you are synchronizing your changes with those from other MadCap Flare authors.
More MadCap Flare Videos: Overview Videos | Shorties | Start a Project | Single-Sourcing | XML Editor | Learning & Development | Content and Features | Micro Content | Context-Sensitive Help | Branding | Styles | Meta Tags | Source Control | Managing Projects | Output | Print-Based Output