Map Merger: Difference between revisions

Map Merger (view source)

5 bytes removed , 16:20, 9 April 2021

m

Fixed first list (previously without code and duplicate point 2)

1,133

edits

@@ Line 3: / Line 3: @@
 This is required for a few reasons:
-) It rewrites the map to minimize differences between different versions of the map (DreamMakers map editor rewrites a lot of the tile keys). This makes the git diff between different map changes much smaller.
+# It rewrites the map to minimize differences between different versions of the map (DreamMakers map editor rewrites a lot of the tile keys). This makes the git diff between different map changes much smaller.
+# Maintainers can actually verify the changes you are making are what you say they are by simply viewing the diff (for small changes at least).
-) Maintainers can actually verify the changes you are making are what you say they are by simply viewing the diff (for small changes at least).
+# The less changes there are in any given map diff, the easier it is for git to merge it without running into unexpected conflicts, which in most cases you have to either manually resolve or require you to remap your changes.
-) The less changes there are in any given map diff, the easier it is for git to merge it without running into unexpected conflicts, which in most cases you have to either manually resolve or require you to remap your changes.
 If you have difficulty using these tools, ask for help in [https://discord.gg/0keg6hQH05Ha8OfO #mapping].