mirror of
https://github.com/TandoorRecipes/recipes.git
synced 2025-12-30 21:49:50 -05:00
11 lines
342 B
Plaintext
11 lines
342 B
Plaintext
# Git attributes configuration for selective merging
|
|
|
|
# Prevent merging of GitHub workflow and configuration files - use custom driver
|
|
.github/** merge=keep-ours
|
|
.github/workflows/** merge=keep-ours
|
|
.github/ISSUE_TEMPLATE/** merge=keep-ours
|
|
|
|
# Prevent merging of version info files
|
|
cookbook/version_info.py merge=ours
|
|
version.py merge=ours
|