The installation software is designed to preserve your changes to user-modifiable files when installing new versions of these files. Existing changes to user-modifiable files are always automatically merged. All files are merged by default.

The installation software also creates a backup of all the versions of the user-modifiable files to ensure that you will not lose any configuration data.

Review the Results of the Reconciliation Process

The results of the reconciliation analysis performed during the installation and all actions taken are included in the merged files log located in /smarts/setup/logs. The name of the log file is: install.merge.<patch version>.log.

Determine which files require action by reviewing the merged files log generated by the install process:
  1. Using any editor, open and review the log:
  2. Review the log:
    • Resolve conflicts in files manually. For more information, see Resolve Issues in Conflict File section.
    • During the installation, the entries that indicate file merges without conflicts that resulted in automerge files.

Resolve Issues in Conflict File

If a conflict occurs for any file in the same local directory of the file location, you can find the following files:
  • One is the conflict file. For example, <filename>
  • Another file is .bak.001. For example, <filename>.bak.001
Review the conflict files and resolve issues using the following procedure:
  1. Open the user-modifiable file where the conflict occurs using sm_edit.

    For example, the conflict file for esm.param.conf is named esm-param.conf.

  2. Rename the <filename>.bak.001 file to the original file name <filename> by removing .bak.001 extension.

    For example, if the patch file name is esm-param.conf.bak.001, rename it to the esmparam.conf to use the original file.

  3. Save and close the file.
    Note: All the user-modifiable unmerged files before patch installation, are backed up in //smarts location. By default, the backup directory is hidden.