Auto resolve merge conflicts

Problem description

When using pixi and pull requests we often have conflicts in the pixi.lock file. Solution is basically to manually resolve these with a pixi install.

Can we have a tool to automate this?

Things I've tried:

git config --global merge.pixi-lock.driver "cp -f %B %A && pixi lock"

And add to my .gitattributes:

pixi.lock merge=pixi-lock linguist-language=YAML linguist-generated=true

But it doesn't work in all cases like stash pop or cherry-pick.

Of course this still requires a manual merge as our bitbucket/github doesn't know pixi.