Редактирование: Resolving icon conflicts (раздел)

= Automatic icon conflict resolver =

== Use as a Git Hook ==

# '''Install the hook''': Open the <code>tools/hooks</code> folder and double-click <code>Install.bat</code>
#* Linux users: run <code>tools/hooks/install.sh</code>

Once complete, the icon merger script will '''automatically''' run every time you <tt>git merge</tt>. The console log will indicate if it was successful or if further action is needed.

== Resolve conflicts on an in-progress merge ==

If you are using a Git GUI which does not run the hook on merge, you can also run the conflict resolver on an in-progress merge by request:
# Open the <code>tools/dmi</code> folder and double-click <code>Resolve Icon Conflicts.bat</code>
#* Linux users: run <code>tools/hooks/dmi.merge --posthoc</code>

The console log will indicate if it was successful or if further action is needed.