My question is fairly simple: how should we handle conflicts in the .nch file when merging different branches in a version control system?
When two branches originate from the same commit, and namechanges are made, the .nch file contains new lines at exaclty the same line numbers, often (always) resulting in conflicts. Currenlty I resolve these by resolving the conflicts with "mine before theirs” as I tend to want to keep both. The need for this (simple) manual intervention is a bit annoying.
What are the alternatives? Could we even simply ignore the .nch file in our git repository? Is there a way to track the file but prevent conflicts? I would like to hear your thoughts!