[MRELEASE-998] Add ability to create custom phases

Author: rfscholte

maven-release-manager/src/main/mdo/release-descriptor.mdo

@@ -751,6 +751,7 @@
 
         ModelloReleaseDescriptor that = (ModelloReleaseDescriptor) obj;
 
+<<<<<<< HEAD
         if ( updateDependencies                  != that.isUpdateDependencies()               ||
              useReleaseProfile                   != that.isUseReleaseProfile()                ||
              autoVersionSubmodules               != that.isAutoVersionSubmodules()            ||
@@ -766,6 +767,23 @@
              localCheckout                       != that.isLocalCheckout()                    ||
              pushChanges                         != that.isPushChanges()                      ||
              autoResolveSnapshotDependencies     != that.autoResolveSnapshotDependencies      ||
+=======
+        if ( updateDependencies               != that.isUpdateDependencies()               ||
+             useReleaseProfile                != that.isUseReleaseProfile()                ||
+             autoVersionSubmodules            != that.isAutoVersionSubmodules()            ||
+             snapshotReleasePluginAllowed     != that.isSnapshotReleasePluginAllowed()     ||
+             commitByProject                  != that.isCommitByProject()                  ||
+             branchCreation                   != that.isBranchCreation()                   ||
+             updateBranchVersions             != that.isUpdateBranchVersions()             ||
+             updateWorkingCopyVersions        != that.isUpdateWorkingCopyVersions()        ||
+             suppressCommitBeforeTagOrBranch  != that.isSuppressCommitBeforeTagOrBranch()  ||
+             updateVersionsToSnapshot         != that.isUpdateVersionsToSnapshot()         ||
+             allowTimestampedSnapshots        != that.isAllowTimestampedSnapshots()        ||
+             remoteTagging                    != that.isRemoteTagging()                    ||
+             localCheckout                    != that.isLocalCheckout()                    ||
+             pushChanges                      != that.isPushChanges()                      ||
+             autoResolveSnapshotDependencies     != that.autoResolveSnapshotDependencies     ||
+>>>>>>> [MRELEASE-998] Add ability to create custom phases
              autoResolveSnapshotDependenciesMode != that.autoResolveSnapshotDependenciesMode
            )
            {