--- a/hgext3rd/evolve/evolvecmd.py	Fri Feb 22 01:02:51 2019 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Feb 28 03:12:39 2019 +0530
@@ -1921,6 +1921,10 @@
             if not res:
                 # no need to proceed for phase divergence resolution step
                 pass
+            elif newnode == publicnode:
+                # merging had the same changes as public changeset and
+                # divergence has been resolved by creating markers
+                pass
             else:
                 prec = repo[publicnode]
                 bumped = repo[newnode]