dim merge

Algorithm

The automatic merge process follows the following rules, when arbitrary choices are required:

1. Modification takes precedence over deletion and stability
2. Deletion takes precedence over stability
3. Directory creation takes precedence over file creation

Figure: dim_dag1.png