Thanks, Leslie. I has been using SourceTree in Flare 11, but I abandoned it when Flare 12 supported SSH.
I still set things up incorrectly in the new Git environment. Going forward, I need to create one project for each archived/released doc version, and have a Git repo created for each version.
Here is MadCap Flare Support's workaround for a topic overwrite:
- Open the source (master) branch in Flare.
- From the ribbon, select Project > Open Output folder.
- Copy the Content folder to another location, such as the Desktop.
- In Flare Source Control ribbon, switch to the target branch.
- Open Output folder for that branch.
- Open the Content folder and overwrite the older topics with the newer files
This method won't necessarily be seamless or fast. The copy/paste method works only for complete file overwrites. I'd renamed ALL *.htm files since the previous version (Marketing wanted hyphen delimiters instead of CamelCase), and there will be TONS of link checking, especially as the newer guide has about 100 new topics, so the TOC will have lots of broken links.
I won't make the same mistake again, that's for sure!