From 218429a8a4c83b98ce97ce4db03c6871a74f51be Mon Sep 17 00:00:00 2001
From: Martin Moss <martyzz1@gmail.com>
Date: Mon, 27 Feb 2023 11:31:28 +0000
Subject: [PATCH] fix the CONFLICT error message

---
 gitfeatures/core.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitfeatures/core.py b/gitfeatures/core.py
index 849639d..ef66a00 100644
--- 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: