From 03d9138744907d9747b4fd394ba39de4609716a4 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 18 Feb 2025 11:33:06 +1300
Subject: [PATCH] Makefile: 'U'-prefixed submodule status

Covering all the bases, I guess?  '-'-prefix is already correctly handled by the base case message.
If the user somehow gets merge conflicts in abc, hopefully they know what they're doing.
---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index b1853f77a..61eac585d 100644
--- a/Makefile
+++ b/Makefile
@@ -780,6 +780,10 @@ check-git-abc:
 		echo "Run 'git submodule update' to check out the correct version."; \
 		echo "Note: If testing a different version of abc, call `git commit abc` in the Yosys source directory to update the expected commit."; \
 		exit 1; \
+	elif git -C "$(YOSYS_SRC)" submodule status abc 2>/dev/null | grep -q '^U'; then \
+		echo "'abc' submodule has merge conflicts."; \
+		echo "Please resolve merge conflicts before continuing."; \
+		exit 1; \
 	elif [ -f "$(YOSYS_SRC)/abc/.gitcommit" ] && grep -q '\$$Format:%[hH]\$$' "$(YOSYS_SRC)/abc/.gitcommit"; then \
 		echo "Error: 'abc' is not configured as a git submodule."; \
 		echo "To resolve this:"; \