It hooks into git as a merge driver and automatically runs with merges.
It prints a log of what it did, and if any specific states are
conflicted it indicates them and does not mark the merge as successful.
The conflicting icon can then be opened in DreamMaker and the
conflicting states resolved there.
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.
The changelog now uses union merges to reduce conflicts.
Changed the EOL in changelog.html to CRLF to help even more.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
