Integrating changes

These topics describe merging versions of text-file elements or directories in various supported scenarios.