mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Update for clarity
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
If you're making a PR to Github, or are a new mapper and have been told to "mapmerge":
|
||||
|
||||
Run dmm2tgm.bat, find the map you edited, and type it in. For instance, Tether Surface 2, is 163.
|
||||
Run dmm2tgm.bat, find the map you edited, and type it in. For instance, as of this date/writing, Tether Surface 2 is 163.
|
||||
|
||||
When you type in and hit enter on 163, it will run mapmerge. This reduces the filediff for easier Git merging.
|
||||
If Tether Surface 2 is still 163, type in 163 and hit enter, it will run mapmerge. This reduces the filediff for easier Git merging.
|
||||
|
||||
NOTE that this is not "merging" two maps together. ALL YOU ARE DOING IS REDUCING FILEDIFF. IF YOU NEED TO MAPMERGE PROPERLY, @ A DEVELOPER OR SOMEONE WITH MAPPING EXPERIENCE.
|
||||
Reference in New Issue
Block a user