From 957bcaa21b8701333270442d22bd95c2d23d740a Mon Sep 17 00:00:00 2001
From: Bruno Postle <bruno@postle.net>
Date: Wed, 10 May 2023 22:45:22 +0100
Subject: [PATCH] Report ifcmerge conflicts in pop-up #3096

---
 src/blenderbim/blenderbim/tool/ifcgit.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/blenderbim/blenderbim/tool/ifcgit.py b/src/blenderbim/blenderbim/tool/ifcgit.py
index 3f8ba55a69..81d0251b32 100644
--- a/src/blenderbim/blenderbim/tool/ifcgit.py
+++ b/src/blenderbim/blenderbim/tool/ifcgit.py
@@ -325,12 +325,12 @@ class IfcGit:
                         # merge is expected to fail, run ifcmerge
                         try:
                             repo.git.mergetool(tool="ifcmerge")
-                        except:
+                        except git.exc.GitCommandError as exc:
+                            message = re.sub("(  stderr: '|')", "", exc.stderr)
                             # ifcmerge failed, rollback
                             repo.git.merge(abort=True)
-                            # FIXME need to report errors somehow
 
-                            operator.report({"ERROR"}, "IFC Merge failed")
+                            operator.report({"ERROR"}, "IFC Merge failed:" + message)
                             return False
                     except: