Help us improve your experience.

Let us know what you think.

Do you have time for a two-minute survey?

 
ON THIS PAGE
 

Resolve Configuration File Merge Conflicts

Problem

Merge conflicts arise when Paragon Automation merges files that the init script creates with the existing configuration files.

Solution

If you update an existing installation using the same config-dir directory that you used for the installation, you may see a conflict. The template configuration files that the init script creates are merged with the existing configuration files. This merge action might create a conflict that you must resolve. The init script prompts you about how to resolve the conflict.

When prompted, select one of the following options to resolve the conflict:

  • C (Default option)—You can retain the existing configuration file and discard the new template file.

  • n—You can discard the existing configuration file and reinitialize the template file.

  • m—You can merge the files manually. Conflicting sections are marked with lines starting with “<<<<<<<<“, “||||||||”, “========“, and “>>>>>>>>”. You must edit the file and remove the merge markers before you proceed with the update.

  • d—You can view the differences between the files before you decide how to resolve the conflict.

Related Documentation