From b2a800c77d01fbe11e9b4b5efb0bb5a2576b25da Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed, 29 Sep 2021 03:16:55 +0200
Subject: [PATCH] [MIRROR] [MDB IGNORE] Add merge conflict markers to linter
 (#8432)

* Add merge conflict markers to linter (#61669)

Updates check_grep.sh with a case for the /obj mapmerge2 creates on merge conflicted tiles. You're supposed to fix all of these before you continue a merge, but there's zero warning if you don't clear them all. As a result they can end up in the commit pushed to github, and they can hide quite easily in a PR that otherwise looks fine.

Your average map file is about 3 megabytes of raw text, or 160,000 lines. I don't want to have to read them all to prevent this from happening again.

* Add merge conflict markers to linter

Co-authored-by: Maurukas <66576896+Maurukas@users.noreply.github.com>
---
 tools/ci/check_grep.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh
index c2d1bd5b490..1d2b4a433ba 100755
--- a/tools/ci/check_grep.sh
+++ b/tools/ci/check_grep.sh
@@ -10,6 +10,10 @@ if grep -El '^\".+\" = \(.+\)' _maps/**/*.dmm;	then
     echo "ERROR: Non-TGM formatted map detected. Please convert it using Map Merger!"
     st=1
 fi;
+if grep -P 'Merge conflict marker' _maps/**/*.dmm; then
+    echo "ERROR: Merge conflict markers detected in map, please resolve all merge failures!"
+    st=1
+fi;
 if grep -P '^\ttag = \"icon' _maps/**/*.dmm;	then
     echo "ERROR: tag vars from icon state generation detected in maps, please remove them."
     st=1