bug: Automate conflict handling of destination/source deletions

Merge manager requires all unresolvable conflicts to have their
source changes reverted. Given that the user has no choice
over this, the system should handle the case for them and
simply report the issue as an informational conflict.

1 files changed, 1 insertions, 5 deletions

diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java
index c387f2ddebb..d412d2b2ee1 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java
@@ -65,11 +65,7 @@ public class ArtifactConflict extends Conflict {
 
    @Override
    public ConflictStatus computeStatus() throws OseeCoreException {
-      if (!sourceModType.isDeleted()) {
-         return super.computeStatus(getObjectId(), ConflictStatus.NOT_RESOLVABLE);
-      } else {
-         return super.computeStatus(getObjectId(), ConflictStatus.INFORMATIONAL);
-      }
+      return super.computeStatus(getObjectId(), ConflictStatus.INFORMATIONAL);
    }
 
    @Override