00:00:07oXygen allows you to perform three-way comparisons on directories to help you identify and merge
00:00:12changes between multiple modifications of the same directory structure.
00:00:17This is especially helpful for teams that
have multiple authors contributing documents
00:00:22to the same directory system.
00:00:24It offers information about conflicts and
changes, and includes actions to easily merge,
00:00:30accept, overwrite, or ignore changes.
00:00:34For this video demonstration let's suppose that we have a Dita project, called "Flowers".
00:00:39We want to send this project to a SME, named Bob, and we will both be editing files in
00:00:46this project at the same time.
00:00:48At some point we will want to compare and merge our changes, so we'll need to compare
00:00:53both our local changes and Bob's changes with the original base file set, because we want
00:01:00to keep track of what has been modified in the project from the moment we sent it to Bob.
00:01:06First I am going to export the Dita map files using the "Export Dita Map " action from the
00:01:12contextual menu of the Dita Maps Manager.
00:01:15I choose to pack the whole project into a
zip archive named "flowers-base".
00:01:23Then I will send the exported project to Bob.
00:01:26From now on, both I and Bob will continue
to work on the two file sets.
00:01:33After a while I get the project back from
Bob and I want to integrate his changes.
00:01:39Remember, I also made same changes in the project and I don't want to lose them.
00:01:44So I need to find a way to integrate both
our versions of the project into the main file set.
00:01:50To do this, I will use the "Compare Directories Against a Base" action from the Tools menu.
00:01:55In the dialog box I need to specify 3 directories:
00:01:59- Base directory - This is the original file set that I sent to Bob,
00:02:06- Left-side directory - Here...I'll select the directory that contains my version of the project.
00:02:15- Right-side directory - I'll select the directory
00:02:20of the project that Bob sent me after his
00:02:23Then I click the Compare action.
00:02:26A new dialog box is presented showing the
00:02:30However, to help you identify easier the modifications,
the toolbar contains:
00:02:35- a summary of all modifications in the project
- a set of actions that allow you to filter
00:02:41the project files in order to show all files,
only certain types of modifications
00:02:47or just the conflicts.
00:02:50By default, the dialog displays only files
modified by others .A solid blue arrow indicates modifications,
00:02:57a blue arrow with the plus sign decorator indicates newly added files,
00:03:03while the red arrows indicate a conflict.
00:03:06In our case, we immediately see Bob's modifications:
There is a conflict on the "flowers.ditamap"
00:03:13file because I added the narcissus topic and
Bob added the roses topic.
00:03:19There is also a modification on the "winterFlowers.dita"
00:03:23The highlighted area indicates that Bob removed
a text comment.
00:03:29Double-click the modification to see it in
00:03:33We can also see that there are two new files added: the "roses.dita" topic and "Rose.jpg" image.
00:03:42To see all changes made in the project (both
mine and Bob's), click the "Show only files
00:03:48modified by you and others" filter button.
00:03:52We can also sort the modifications by their
00:03:55Now we can see also the "Narcissus.dita" topic
and the image file that I added.
00:04:01To merge Bob's changes into my local file
set I'll use the "Accept all non-conflicting
00:04:07changes" action from the toolbar.
00:04:09A dialog box is presented that notifies me
that the local files will be updated.
00:04:15Now all modifications that Bob made are merged
into my local project, which also contains
00:04:21my local changes.
00:04:23Now, let's inspect the Ditamap to see how
00:04:30See the "Roses.dita" topic that Bob added
in the project.
00:04:35And this concludes our demonstration.
00:04:37Thanks for watching.