Skip to main content
F
FMdancer
Known Participant
April 29, 2015
Answered

How do I accept/reject green/red changes in a FM CMP Compare Document

  • April 29, 2015
  • 2 replies
  • 910 views

I am working in FM 11 and needed to merge one file that two writers worked on at the same time with different sections of that file updated. I used the FM Utility > Compare Documents. The result CMP file showed me the inserted text in bright green and the deleted text in red. How do you accept/reject these changes? My workaround is to retype what I wanted to keep and select and delete text I wanted to delete.

I also tried to use SVN update to merge the files, but SVN didn't seem to be able to merge my two files (even though SVN merged a text file that user 1 UPDATED before they COMMITTED their change. The UPDATE merged the changes from writer 1 to the working copy from writer 2 without disturbing writer 2's changes. Then writer 2 was able to COMMIT. But this only worked on a TXT file and did not work with FM files. With FM, SVN just would not let writer 2 UPDATE if his copy was not in sync with the committed copy.

Ideally I would like to be able to merge changes on the same file from two writers who updated different sections. Any suggestions? Thanks.

    This topic has been closed for replies.
    Correct answer Arnis Gubins

    The Compare utility just adds simple conditional tags to show the differences in a brand new combined version. Accept/reject only works with the track text edit modes, but you can't do track text edits when writers are trying to work concurrently on the same file.

    You're probably best off splitting the file into smaller sections so that the edits can be done concurrently. Then use either the book function or a new file with text insets to stitch things back together.

    2 replies

    W
    Community Expert
    Winfried RengCommunity Expert
    Community Expert
    April 30, 2015

    Another approach:

    FrameMaker uses the conditions Inserted and Deleted to mark inserted and deleted text in the CMP file.

    In the Search/Replace dialog select the Deleted condition for deleted text to search for.

    Leave the Replace box empty.

    Then search for the Deleted condition and either replace (i.e. delete the text) or leave it as it is.

    After this search/replace the remaining text with the Deleted condition is correct. Therefore delete this condition without deleting the text.

    Then do the same with the Inserted condition for inserted text. Either delete this text or leave it as it is.

    Then delete this Inserted condition.

      F
      FMdancerAuthor
      Known Participant
      April 30, 2015

      I think I see how to conditionally search for the condition "Deleted." But I do not know how to set the replace for the condition "Inserted" to replace the bright green text with body text. Please explain. Thanks.

      W
      Community Expert
      Winfried RengCommunity Expert
      Community Expert
      April 30, 2015

      You can either delete the Inserted condition in the Conditional Text pod. Then the text is kept and the condition is gone.

      Or you put your insertion mark somewhere in the text without any condition and copy the condition (right mouse button, Copy Special, Copy Conditional Text Settings).

      Then select By Pasting in the Replace box.

      Then search for the Inserted condition and replace.

        Arnis Gubins
        Arnis GubinsCorrect answer
        Inspiring
        April 30, 2015

        The Compare utility just adds simple conditional tags to show the differences in a brand new combined version. Accept/reject only works with the track text edit modes, but you can't do track text edits when writers are trying to work concurrently on the same file.

        You're probably best off splitting the file into smaller sections so that the edits can be done concurrently. Then use either the book function or a new file with text insets to stitch things back together.

          Firefly Community Gallery
          Adobe Firefly

          Remix with Firefly Community Gallery

          Thousands of free creations to fall in love with and remix in Firefly.

          Explore now
          Terms & ConditionsAccessibility statement
          Using the community Terms of use Privacy Cookie preferences Do not sell or share my personal information ad choicesAdChoices