SkyratBot b2a800c77d [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>

2021-09-29 02:16:55 +01:00

..

build_spaceman_dmm.sh

Fixing documentation (again) (#8097)

2021-09-10 18:24:38 -04:00

build.ps1

[MIRROR] Exit on DreamMaker warnings in CI Windows build + Tools reset (#7784)

2021-09-01 16:41:46 +01:00

check_changelogs.sh

…

check_filedirs.sh

…

check_grep.sh

[MIRROR] [MDB IGNORE] Add merge conflict markers to linter (#8432)

2021-09-29 02:16:55 +01:00

check_misc.sh

[MIRROR] tgui maintenance chores (#7597)

2021-08-17 19:15:40 +01:00

ci_config.txt

…

dm.sh

…

download_byond.sh

…

install_byond.sh

…

install_node.sh

…

install_rust_g.sh

[MIRROR] Update rust-g version to latest release (#6581)

2021-06-29 16:44:59 +01:00

install_spaceman_dmm.sh

…

run_server.sh

…