Skip to content

Solving future merge conflicts #5699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kocma-san wants to merge 24 commits into
base: master
Choose a base branch
from

Fix all our broken grep checks

be4b540
Select commit
Loading
Failed to load commit list.
Open

Solving future merge conflicts #5699

Fix all our broken grep checks
be4b540
Select commit
Loading
Failed to load commit list.
MapDiffBot-2 / MapDiffBot2 succeeded Nov 8, 2025 in 15s

Map renderings

Please file any issues here.

Github may fail to render some images, appearing as cropped on large map changes. Please use the raw links in this case.

Maps with diff:

Details

MODIFIED - _maps/safehouses/ancientmilsim_nova.dmm (Z-level: 1)

Modified region: (1, 1) -> (3, 5)

Raw links: Old - New - Diff

Old New Difference
If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above
View more details on MapDiffBot-2