Search for	Example	Results
A single word	`cat`	Topics that contain the word "cat". You will also find its grammatical variations, such as "cats".
A phrase. You can specify that the search results contain a specific phrase.	`"cat food"` (quotation marks)	Topics that contain the literal phrase "cat food" and all its grammatical variations. Without the quotation marks, the query is equivalent to specifying an OR operator, which finds topics with one of the individual words instead of the phrase.

Search for	Operator	Example
Two or more words in the same topic	`AND` `and` `+` (plus symbol) `&` (ampersand)	`cat AND dog` `"cat food"+milk` `"cat food"&"dog food"`
Either word in a topic	`OR` `or` `\|` (pipe)	`cat OR dog` `cat \| dog`
Topics that do not contain a specific word or phrase	`NOT` `not` `!` (exclamation point)	`NOT cat` `! dog`
Topics that contain one string and do not contain another	`^` (caret)	`cat ^ mouse`
A combination of search types	`( )` parentheses	`cat + (dog \| mouse)` `cat \| dog + (! mouse)`

Service Manager9.50

Upgrade > Upgrade the applications > Upgrade tasks on the development environment > Step 9: Resolve conflicts > Standard conflict resolution process

Standard conflict resolution process

The standard process of resolving conflicts are listed as follows:

To view the conflicts, click System Administration > Ongoing Maintenance > Upgrade Utility > View/Merge Results.
(Optional) Select View Upgrade Results and Merge Conflicts, and then click Next.

Note This screen appears only after Process Designer Hybrid migration.
Search for records with a status of "Renamed."
For each renamed object, you can choose one of the following options.
- Option 1: Use your customized object instead of the new object.
  
  In this case, delete the new object that is prefixed with NEW950 and the copied object that is prefixed with PRE<version_number>.
- Option 2: Use the new object instead of your customized object.
  
  In this case, delete your customized object and the copied object that is prefixed with PRE<version_number> and then rename the new object by removing the NEW950 prefix, or you can select Choose Upgrade to replace the object with the new object that is prefixed with NEW950.
  
  The Mass Choose Upgrade feature can help you replace multiple customized objects with new objects that are prefixed with NEW950. For more information, see the Using the Mass Choose Upgrade feature.
- Option 3: Merge the changes shipped with the new object into your customized object.
  
  In this case, find out what changes the new object includes, manually apply those changes to your customized object, and then delete the new object that is prefixed with NEW950 and the copied object that is prefixed with PRE<version_number>.
Note The Merge tool, Auto-Merge and Revert options, and third-party three-way compare and merge tools can assist you in comparing the objects and merging the code during the out-of-box upgrade. See Using the Merge tool and Using the Auto Merge and Revert options for more information.
After resolving each conflict, you must mark the object as "Reconciled." Marking an object as reconciled will remove it from the current conflict list and provides the version with which the object was last reconciled.

Note The Mark as Reconciled feature can assist you to mark the object as Reconciled. For more information, see Using the Mark as Reconciled feature.

For more specific guidelines and examples for conflict resolution, see white paper Conflict Resolution for Upgrade to Service Manager (SM) 9.3x.

Send Help Center feedback