Patent ID: 9665359
Date: 2017-05-30
CPC Classifications: G06F

Claim:
1. A computer-implemented method, comprising: identifying a first conflict between a customized version of a computer system and an update to the customized version of the computer system; automatically resolving the first conflict comprising: identifying a second conflict between the customized version of the computer system and the update to the customized version of the computer system that has not been automatically resolved; generating a representation of a conflict resolution result user interface display showing a conflict resolution result corresponding to the automatic resolution of the first conflict and identifying the modification to the customized version, the conflict resolution result user interface display including a user actuatable unresolved indicator representing the second conflict that has not been automatically resolved; receiving an indication of user actuation of the user actuatable unresolved indicator; and based on the indication of user actuation of the user actuatable unresolved indicator, generating a representation of a conflict details user interface display that displays details corresponding to the second conflict that has not been automatically resolved.