SysMergeUtil Class [AX 2012]

This class provides a series of merging heuristics for merging code conflicts.

class SysMergeUtil

Run On

Server

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

Object Class
  SysMergeUtil Class

Community Additions

ADD
Show: