cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames instruction file, removes obsolete mapmerge driver bit

Browse Source
This commit is contained in:
Crazylemon64
2016-04-12 10:37:14 -07:00
parent 894cc7b8d4
commit 014ddc3108
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/mapmerge/install.txt → tools/mapmerge/instructions.txt
-11
View File
@@ -6,14 +6,3 @@ Committing
2. After finishing your edit, and before your commit, double-click "clean_map.bat" in the tools/mapmerge/ directory.
This will make sure in the new version of your map, no paths are needlessly changed, thus instead of 8000 lines changed you'll get 50 lines changed. This not only reduces size of your commit, it also makes it possible to get an overview of your map changes on the "files changed" page in your pull request.
Merging
The easiest way to do merging is to install the merge driver. For this, you can just double-click "install_driver.bat" in the tools/mapmerge/ directory.
Alternatively, open ParadiseSS13/.git/config in a text editor, and paste the following lines to the end of it:
[merge "merge-dmm"]
name = mapmerge driver
driver = ./tools/mapmerge/mapmerge.sh %O %A %B
After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues.