Right now I'm trying out the RoboHelp demo to replace using Flare for work. The one thing that doesn't seem to have a replacement is Flare's version control where you basically A/B two drafts to see what changed. I've been researching a similar replacement for RoboHelp but I'm coming up empty so far.
Does anyone know of a good replacement for this Flare feature? We use Git for source control, if that matters at all.
Copy link to clipboard
Yes, while merging conflicting changes are shown and their diff can be seen with the application of your choice
After pushing files, if you receive the following message, it indicates a merge conflict in the files:
“The tip of your current branch is behind its remote counterpart. Try pulling before pushing.”
To merge conflicts if the changes are made in the same file: