sort out bytes object string

robinedwards · Feb 27, 2023 · 0f1b43e · 0f1b43e
1 parent 151cd69
commit 0f1b43e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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"