If a conflict occurs for any file in the same local directory of the file location, you can find the below 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. Review and resolve the conflict manually.
  3. Save and close the file.

To use patch introduced file (for example, esm-param.conf):

  1. Rename the original conflict file. (For example, if the conflict file name is esm-param.conf, rename the file esm-param.conf to esm-param.conf_old).
  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 esm-param.conf to use the original file.

  3. Save and close the file.

All the user-modifiable unmerged files before patch installation, are backed up in "<BASEDIR>/<Product Name>/smarts" location. By default, the backup directory is hidden.