# SCM syntax highlighting & preventing 3-way merges
pixi.lock merge=binary linguist-language=YAML linguist-generated=true
# reduce the number of merge conflicts
doc/whats-new.rst merge=union
