From 0f1b43e29774ba8ae696041da4773e3a58818548 Mon Sep 17 00:00:00 2001
From: Martin Moss <martyzz1@gmail.com>
Date: Mon, 27 Feb 2023 11:23:32 +0000
Subject: [PATCH] sort out bytes object string

---
 gitfeatures/core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitfeatures/core.py b/gitfeatures/core.py
index 5dae0d0..849639d 100644
--- a/gitfeatures/core.py
+++ b/gitfeatures/core.py
@@ -146,7 +146,7 @@ def pullrequest(args):
                 print(output)
                 print("Congratulations, successfully {}d {}".format(merge_strategy, master_branch))
             except CalledProcessError as e:
-                if "CONFLICT" in e.output:
+                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"