SysMergeUtil Class [AX 2012]
This class provides a series of merging heuristics for merging code conflicts.
| Method | Description | |
|---|---|---|
| basicDiffMerge | |
| basicMerge | Performs a merge that decides what code to accept based on the contents of each conflicting block of code. |
| blockMerge | |
| blockMergePass | Performs a merge that decides what code to accept based on whether or not conflicting blocks exist in certain layers. |
| cancelTimeOut | Cancels a previous method call to the setTimeOut method. (Inherited from Object.) |
| commentBlockMerge | |
| commentBlockMergePass | Performs a merge that decides what code to accept based on whether or not the conflicting blocks are comments. |
| countConflicts | Counts the number of conflicts in the diff. |
| equal | Determines whether the specified object is equal to the current one. (Inherited from Object.) |
| formatDiffMerge | |
| formatMerge | Takes in a diff list and a delimiter to construct the properly formatted text result of the merge. |
| getTimeOutTimerHandle | Returns the timer handle for the object. (Inherited from Object.) |
| handle | Retrieves the handle of the class of the object. (Inherited from Object.) |
| mergeText | This method performs a default text-based merge of the specified strings. |
| new | |
| notify | Releases the hold on an object that has called the wait method on this object. (Inherited from Object.) |
| notifyAll | Releases a lock on the object that was issued by the wait method on this object. (Inherited from Object.) |
| objectOnServer | Determines whether the object is on a server. (Inherited from Object.) |
| owner | Returns the instance that owns the object. (Inherited from Object.) |
| setTimeOut | Sets up the scheduled execution of a specified method. (Inherited from Object.) |
| toString | Returns a string that represents the current object. (Inherited from Object.) |
| usageCount | Returns the current number of references, that is, the value of the reference counter, that the object has. (Inherited from Object.) |
| wait | Pauses a process. (Inherited from Object.) |
| xml | Returns an XML string that represents the current object. (Inherited from Object.) |
| ::commentCommon | |
| ::commentIntersection | |
| ::commentLines | |
| ::construct | Builds a new instance of the object with the specified diff labels. |
| ::diffContainsId | |
| ::filterDiffByOrigin | |
| ::getCommentNest | |
| ::getListWithDiffId | |
| ::isBlockBlank | |
| ::isBlockComment | |
| ::isDiffSame | |
| ::isLineComment | |
| ::list2Con | |
| ::makeComparable | |
| ::preProcess | |
| ::setSubtract |
Community Additions
ADD
Show: