Resolving merge conflicts for PRs opened before Oct' 4

[pmeier]

After #4384 was merged on Oct' 4, we now use ufmt to format our code base and enforce this code style on every PR. In case you opened a PR before that, you will likely see merge conflicts popping up. Here is what you do:

$ git checkout main
$ git pull
$ git checkout $MY_FEATURE_BRANCH
$ git merge -X ours main
$ pre-commit run --all-files
$ git commit -am "fix code format"
$ git push

This should work for most cases. If you encounter any issues with that, feel free to ping @pmeier on your PR to help you fix it.