1 files changed, 10 insertions, 10 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
index 3a9eaa39b2..3afbdd66f4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -1047,16 +1047,6 @@ public class MergeOp {
 
   private void sendMergeFail(final Change c, final ChangeMessage msg,
       final boolean makeNew) {
-    if (isDuplicate(msg)) {
-      return;
-    }
-
-    try {
-      db.changeMessages().insert(Collections.singleton(msg));
-    } catch (OrmException err) {
-      log.warn("Cannot record merge failure message", err);
-    }
-
     if (makeNew) {
       try {
         db.changes().atomicUpdate(c.getId(), new AtomicUpdate<Change>() {
@@ -1081,6 +1071,16 @@ public class MergeOp {
       }
     }
 
+    if (isDuplicate(msg)) {
+      return;
+    }
+
+    try {
+      db.changeMessages().insert(Collections.singleton(msg));
+    } catch (OrmException err) {
+      log.warn("Cannot record merge failure message", err);
+    }
+
     PatchSetApproval submitter = null;
     try {
       submitter = getSubmitter(db, c.currentPatchSetId());