Please sign in to comment.
Automatic DMI merge stuff
- Loading branch information...
Showing with 24 additions and 0 deletions.
|@@ -0,0 +1,8 @@|
|java -jar tools/dmitool/dmitool.jar merge $1 $2 $3 $2|
|if [ "$?" -gt 0 ]|
|echo "Unable to automatically resolve all icon_state conflicts, please merge manually."|
|@@ -0,0 +1,12 @@|
|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 ).|
|The easiest way to do merging is to install the merge driver. For this, open `Baystation12/.git/config` in a text editor, and paste the following lines to the end of it:|
|name = iconfile merge driver|
|driver = ./tools/dmitool/dmimerge.sh %O %A %B|
|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.|