MadCap Software Forums

I have been trying to check-in a topic. It says that there are conflicts. While trying to resolve the conflicts, it asks to auto merge. While trying to auto merge, it says as there are conflicts, cannot auto-merge. The progress window appears for a second and disappears. Unable to add/check in a topic. Solution please.
TIA.

What source control are you using? Is there an interface for it outside of Flare that you can open to try resolve the conflicts there?