--- a/hgext3rd/evolve/evolvecmd.py	Mon Feb 25 22:50:24 2019 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Feb 28 02:02:18 2019 +0530
@@ -1903,11 +1903,13 @@
         if publicdiv:
             res, newnode = ret
             if not res:
-                return (res, newnode)
-            prec = repo[publicdiv]
-            bumped = repo[newnode]
-            ret = _resolvephasedivergent(ui, repo, prec=prec, bumped=bumped,
-                                         tmpctx=bumped)
+                # no need to proceed for phase divergence resolution step
+                pass
+            else:
+                prec = repo[publicdiv]
+                bumped = repo[newnode]
+                ret = _resolvephasedivergent(ui, repo, prec=prec,
+                                             bumped=bumped, tmpctx=bumped)
         tr.close()
         return ret
     finally: