fix the CONFLICT error message

robinedwards · Feb 27, 2023 · 218429a · 218429a
1 parent 0f1b43e
commit 218429a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gitfeatures/core.py b/gitfeatures/core.py
@@ -148,8 +148,8 @@ def pullrequest(args):
             except CalledProcessError as e:
                 if b"CONFLICT" in e.output:
                     err = (
-                        e.output
-                        + "\n\nUnlucky! You have work to do. Fix the above conflicts and run git pullrequest again"
+                        e.output.decode()
+                        + " \n\nUnlucky! You have work to do. Fix the above conflicts and run git pullrequest again"
                     )  # noqa
                     sys.exit(err)
                 else: