Handle modify/delete conflict if there is other output

jupyterhub · Apr 20, 2022 · 1c5fcbb · 1c5fcbb
1 parent 9349e3c
commit 1c5fcbb
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/nbgitpuller/pull.py b/nbgitpuller/pull.py
@@ -275,11 +275,13 @@ def merge(self):
                 yield line
 
         except subprocess.CalledProcessError as exc:
-            for line in exc.output.decode().splitlines():
+            lines = exc.output.decode().splitlines()
+            for line in lines:
                 yield line
 
-            if exc.output.decode().startswith("CONFLICT (modify/delete)"):
-                raise ModifyDeleteConflict() from exc
+            for line in lines:
+                if line.startswith("CONFLICT (modify/delete)"):
+                    raise ModifyDeleteConflict() from exc
             raise
 
     def commit_all(self):