1 Reply Latest reply on Jan 28, 2015 2:34 AM by Willam van Weelden

    Merge conflict snippet

    YvesFJ

      How does the Merge tool work for snippet conflicts? Two TWs working off a server using RH9. We are both deleting snippets in the RHsnippet.apj file so they get out of synch when one of us gets latest.

        • 1. Re: Merge conflict snippet
          Willam van Weelden Adobe Community Professional & MVP

          What do you mean by 'merge tool'? RoboHelp doesn't include its own merge tool.

           

          Are you using source control? (Working of a server suggests so, at least I hope.) If so, make sure to make check outs exclusive for RoboHelp projects. That way you will avoid merging issues. If you want multiple check outs, you will have to use a third party merge tool or the source control system built in merge tool to resolve conflicts.

           

          Kind regards,

           

          Willam