Git Attributes Merge Ours

Question

I want not to merge a specific folder to another branch.

ex) sample_folder/* merge=ours

On single file, index.php merge=ours works fine. But no idea how to apply this to files inside of the folder.

Answer 1

This should be enough:

sample_folder/ merge=ours 

The gitattributes man page explicitly mention

Some of these settings can also be specified for a path, so that Git applies those settings only for a subdirectory or subset of files

Since the Merge Strategies only mention files, you might have to tweak the file selector

sample_folder/*/* merge=ours 
# or
sample_folder/**/** merge=ours