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.
On this page: Overview Videos | Start a Project | Single-Sourcing | XML Editor | Learning & Development | Content and Features | Micro Content | Context-Sensitive Help | Styles | Meta Tags | Source Control | Managing Projects | Output | Print-Based Output
Overview Videos
Start a Project
Single-Sourcing
XML Editor
Learning & Development
Learning and Development Part 1 of 10: Introduction to Learning and Development in Flare
Learning and Development Part 2 of 10: Creating a Project for eLearning
Learning and Development Part 3 of 10: Creating eLearning Content
Learning and Development Part 4 of 10: Updating a TOC for eLearning
Learning and Development Part 5 of 10: Single-Sourcing eLearning Content
Learning and Development Part 6 of 10: Navigation and Design for eLearning
Learning and Development Part 7 of 10: Creating and Developing Targets for eLearning
Learning and Development Part 8 of 10: PDF Output for eLearning
Learning and Development Part 9 of 10: Building, Viewing, and Publishing eLearning Output
Learning and Development Part 10 of 10: Integrating eLearning Output with an LMS
eLearning Template Content Features in MadCap Flare
Content and Features
Micro Content
Micro Content (1 of 15): Introduction
Micro Content (2 of 15): Methods for Creating Micro Content
Micro Content (3 of 15): Featured Snippets in Search Results
Micro Content (4 of 15): Knowledge Panel in Search Results
Micro Content (5 of 15): Knowledge Proxy in Topic Output
Micro Content (6 of 15): Promotion Proxy in Topic Output
Micro Content (7 of 15): FAQ Proxy in Topic Output
Micro Content (8 of 15): Promotion Proxy in Search Results
Micro Content (9 of 15): Knowledge Proxy in Search Results
Micro Content (10 of 15): Skins and Micro Content Skin Components
Micro Content (11 of 15): Micro Content for Field-Level Help
Micro Content (12 of 15): Micro Content and Analytics
Micro Content (13 of 15): Single-Sourcing Micro Content
Micro Content (14 of 15): Chatbots and Other Advanced Uses
Micro Content (15 of 15): What the MadCap Doc Team Does
Context-Sensitive Help
Styles
Styles: Part 1 of 11 Introduction
Styles: Part 2 of 11 Creating and Editing Stylesheets
Styles: Part 3 of 11 Primary and Local Stylesheets
Styles: Part 4 of 11 Selectors
Styles: Part 5 of 11 Applying Styles
Styles: Part 6 of 11 Style Inspector
Styles: Part 7 of 11 MadCap Styles and Properties
Styles: Part 8 of 11 Inheritance
Styles: Part 9 of 11 Mediums
Styles: Part 10 of 11 Media Queries
Styles: Part 11 of 11 Table Styles
Meta Tags
Source Control
Source Control (1 of 11): Introduction
Source Control (2 of 11): Binding and Importing Projects
Source Control (3 of 11): Single-Bound vs. Dual-Bound
Source Control (4 of 11): The Essential Processes and Steps
Source Control (5 of 11): Other Source Control Activities
Source Control (6 of 11): Overview of Branching
Source Control (7 of 11): Gitflow and Branching
Source Control (8 of 11): Main Branching Activities
Source Control (9 of 11): Other Branching Activities
Source Control (10 of 11): Conflicts
Source Control (11 of 11): Tips, Tricks, and Best Practices
Managing Projects
Output
Print-Based Output
Print-Based Output (1 of 15): Introduction
Print-Based Output (2 of 15): Quick and Easy PDF Output
Print-Based Output (3 of 15): Fancy Schmancy Mockup
Print-Based Output (4 of 15): Title Page
Print-Based Output (5 of 15): Copyright Page
Print-Based Output (6 of 15): Generated TOC
Print-Based Output (7 of 15): Chapters
Print-Based Output (8 of 15): Appendix
Print-Based Output (9 of 15): Index
Print-Based Output (10 of 15): Outline TOC
Print-Based Output (11 of 15): PDF Targets
Print-Based Output (12 of 15): Build, View, Fix
Print-Based Output (13 of 15): Images
Print-Based Output (14 of 15): Breaks
Print-Based Output (15 of 15): Quickly Creating Additional PDFs
