Looking for the closest thing to match Flare's version control

[mb93967779]

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.

[surbhi_maheshwari]

Hi,

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:

Prerequisites:

1. Choose Edit > Preferences > Version Control.
2. Provide the path of the .exe file of any External Diff/Merge Application.

• Choose Collaborate > Pull. The following message appears:
  “Your local changes conflicted with changes made on the remote branch. Resolve the conflicts and commit to continue.”

• Choose Collaborate > Commit. This marks the conflicted files with Action as “In merge conflict” to indicate that there is a difference.Then, to resolve conflicts, click .

• Ensure that the merge application is already added. To add merge application, follow the steps in the Prerequisites.
• Then, select the changes you want to commit and save the changes in the merge application. Close the merge application.
• Select the file in the already open Commit dialog box and provide the commit description. Click Commit.Then, click Push. Git repository changes and the local RoboHelp project is in sync now.

  Please give it a try and let us know if you face any issue.

  Thanks and Regards,
  
  Surbhi Maheshwari