git - how to force manual merge on files in a specific folder, even when there is no conflict

Question

I have one type of files which are located in specific folder, called \'testflow\'. All files in this folder are text files which are auto-generated by GUI program, and any