# Prefer current branch version during rebase/merge generated configuration files
config/rendered/**        merge=ours
