This log lists the files in the BASEDIR/smarts/local directory structure that were merged. For each merged file, the log lists the location and name of the file. If any file cannot be merged due to conflicts, this is also noted. In addition, the log lists the name and location for unmerged versions of all user-modifiable files that are included in the patch.
For example, in case of ESM:
- Summary of merge operation can be found at location :
- For more detail logs:
If there were any conflict during the merge operation, the old local backup file will be saved as "File_Name.bkp" in its same location. These conflict files needs to be merged manually before starting the server.