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

== Resolving conflicts ==
    #first reset the file to match the latest on tgstation's master branch
    git checkout upstream/master -- path/to/conflicted/file.dmi
    ... repeat for each conflicted file

'''Open dreammaker and copy your changed icon back into the conflicted dmi's from your safe space using DreamMaker'''

yes it's expected your file won't be in the dmi, you just reset it, that's why you copied it out earlier to a safe location.
Save and close DreamBreaker

seriously do this before using git again or you will suffer a great pain