We're currently using Madcap Flare and Rational ClearCase. We're creating branches for all of the major software releases and sub-branches for the minor software releases. While ClearCase works well for software developers because they can do automated merges, we're having to manually update topics in two locations (branch or sub-branch) and "merging" (i.e., forcing an overwrite of the original file with the new file) the major releases back to our /MAIN line.
Is there a better way to do this using Flare? Can we output the .HTM files as text files, diff the text files and do an automated merge?
I'm a Flare and ClearCase newbie, so please bear with me.