How to organize joint development?

Question

git

The bottom line is this - I'm developing a custom map in dota 2 with a friend, I work in lua scripts, it's in kv files, everything is pushing / pulling normally, but we change the map itself together and when the map changes, 2 more files change. When you try to spool, a conflict occurs, but, because these files in text form look like krakozyabry, of course, the conflict cannot be fixed in any way. How can we solve this problem?

Answer 1

If these files are generated from sources, then they have no place in the sources

Answer 2

As far as I understand - the problematic file has a binary format - then Git will not help in any way in resolving conflicts.
If this file is the result of automatic generation (build) from text files, resolve conflicts in these source text files. If this file is generated, for example, by some GUI program - I have no idea, it's better to ask this question to people who work with the same tasks.