commit fb9a773d03919f3b0bde8d01f3305f29e4016a1e
author Branden Phillips <branden.w.phillips@boeing.com> Mon Feb 22 15:12:36 2021 -0700
committer Ryan D. Brooks <ryan.d.brooks@boeing.com> Mon Feb 22 15:12:36 2021 -0700
tree dfa87fd6814438cab8d5cdb1d4b8500f5fbd7ff7
parent 53b25b5b64e366215f3e38d9b3530ce7c89bf6c1

bug: Misleading errors being shown when selecting Commit in Progress option

Change-Id: Id1753339a9c2b8db7109401a6add5df967896c0c
Signed-off-by: Branden Phillips <branden.w.phillips@boeing.com>

plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/MergeInProgressHandler.java

diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/MergeInProgressHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/MergeInProgressHandler.java
index 06b1b4e..925eb20 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/MergeInProgressHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/MergeInProgressHandler.java
@@ -71,8 +71,10 @@
          toReturn = true;
       } else if (userOption == LAUNCH_MERGE_VIEW) { // Launch Merge
          MergeView.openView(sourceBranch, destinationBranch, BranchManager.getBaseTransaction(sourceBranch));
+         toReturn = true;
       } else if (userOption == DELETE_MERGE) { // Delete Merge
          deleteSingleMergeBranches(sourceBranch, destinationBranch, skipPrompts);
+         toReturn = true;
       } else if (userOption == FORCE_COMMIT) { // Force Commit, admin only
          TransactionResult transactionResult = BranchManager.commitBranch(null, conflictManager, archiveBranch, true);
          if (transactionResult.isFailed()) {
@@ -80,7 +82,7 @@
          }
          toReturn = true;
       } else if (userOption == CANCEL) {
-         // do nothing
+         toReturn = true;
       }
       return toReturn;
    }