merge_error can be set when MR is mergeable (#31)

Author: pepakriz

src/MergeRequestAcceptor.ts

@@ -135,11 +135,7 @@ export const acceptMergeRequest = async (gitlabApi: GitlabApi, mergeRequest: Mer
 			continue;
 		}
 
-		if (
-			mergeRequestInfo.merge_status !== MergeStatus.CanBeMerged
-			|| mergeRequestInfo.merge_error !== null
-			|| mergeRequestInfo.work_in_progress
-		) {
+		if (mergeRequestInfo.work_in_progress) {
 			return {
 				kind: AcceptMergeRequestResultKind.CanNotBeMerged,
 				mergeRequestInfo,
@@ -159,6 +155,14 @@ export const acceptMergeRequest = async (gitlabApi: GitlabApi, mergeRequest: Mer
 			continue;
 		}
 
+		if (mergeRequestInfo.merge_status !== MergeStatus.CanBeMerged) {
+			return {
+				kind: AcceptMergeRequestResultKind.CanNotBeMerged,
+				mergeRequestInfo,
+				user,
+			};
+		}
+
 		if (containsLabel(mergeRequestInfo.labels, BotLabels.Rebasing)) {
 			await gitlabApi.updateMergeRequest(mergeRequest.project_id, mergeRequest.iid, {
 				labels: [...filterBotLabels(mergeRequestInfo.labels)].join(','),