1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
<!DOCTYPE para>
<para>
The json-based data file can be stored in a version control system (vcs)
like svn or git.
<itemizedlist>
<listitem>
<para>
Do not synchronize the file with your vcs while you modify it at the same time;
save your changes first, close the application and re-open the json file afterwards.
</para>
</listitem>
<listitem>
<para>
In case of merge conflicts in the json-based data files,
note that uuid strings do uniquely identify all json objects.
Relations between objects are defined by these uuid strings.
In contrast to uuids, integer-id can be changed
as long as they are unique among all objects of same type within the file.
Also the names of classifiers (nodes) must be unique.
</para>
</listitem>
<listitem>
<para>
To see the changes between versions of the json file, consider to use the following option:
<command>git diff --patience</command>
The result may better explain the changes.
</para>
</listitem>
<listitem>
<para>
Note that these merge and diff features require at least version 1.39.0 to work smoothly.
</para>
</listitem>
</itemizedlist>
</para>
|
