Редактирование: Map Merger (раздел)

== Automatic conflict resolver ==

We also have a rudimentary conflict resolver to cover some cases that the TGM conversion couldn't prevent.

When run, the console output will indicate whether further manual action is needed, including conflicting coordinates.

=== 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 conflict resolver will run '''automatically''' every time you merge in Git.

=== Or: 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/mapmerge2/</code> folder and double-click <code>Resolve Map Conflicts.bat</code>
#* Linux users: run <code>tools/hooks/dmm.merge --posthoc</code>

Note that to use this, you must merge your updated local master branch into the branch with conflicts so that your Git GUI reports a conflict on the map file.