Tkdrg
553ce69257
Credits to GinjaNinja32@bay12 for developing dmitool and PsiOmegaDelta@bay12 for some of these scripts. Thanks also to neersighted for reminding me that we need this. Basically this is like the map merger, except for icons. You can install a hook using the instructions in the dmitool folder, and it should automatically merge your DMIs for you. This means you can solve icon conflicts effortlessly most of the time.
15 lines
1.0 KiB
Plaintext
15 lines
1.0 KiB
Plaintext
1. Install java(http://www.java.com/en/download/index.jsp)
|
|
2. Make sure java is in your PATH. To test this, open git bash, and type "java". If it says unknown command, you need to add JAVA/bin to your PATH variable (A guide for this can be found at https://www.java.com/en/download/help/path.xml ).
|
|
|
|
Merging
|
|
The easiest way to do merging is to install the merge driver. For this, open `-tg-station/.git/config` in a text editor, and paste the following lines to the end of it:
|
|
|
|
[merge "merge-dmi"]
|
|
name = iconfile merge driver
|
|
driver = ./tools/dmitool/dmimerge.sh %O %A %B
|
|
|
|
You may optionally instead run git_merge_installer.bat or git_merge_installer.sh which should automatically insert these lines for you at the appropriate location.
|
|
|
|
After this, merging DMI files should happen automagically unless there are conflicts (an icon_state that both you and someone else changed).
|
|
If there are conflicts, you will unfortunately still be stuck with opening both versions in the editor, and manually resolving the issues with those states.
|